--- loncom/interface/domainprefs.pm	2012/08/27 00:53:22	1.168
+++ loncom/interface/domainprefs.pm	2013/02/25 17:43:41	1.191
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.168 2012/08/27 00:53:22 raeburn Exp $
+# $Id: domainprefs.pm,v 1.191 2013/02/25 17:43:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,7 +45,7 @@ described at http://www.lon-capa.org.
 =head1 OVERVIEW
 
 Each institution using LON-CAPA will typically have a single domain designated 
-for use by individuals affliated with the institution.  Accordingly, each domain
+for use by individuals affiliated with the institution.  Accordingly, each domain
 may define a default set of logos and a color scheme which can be used to "brand"
 the LON-CAPA instance. In addition, an institution will typically have a language
 and timezone which are used for the majority of courses.
@@ -219,7 +219,11 @@ sub handler {
                        'requestcourses','requestauthor','coursecategories',
                        'serverstatuses','helpsettings',
                        'coursedefaults','usersessions');
-    if (keys(%servers) > 1) {
+    my %existing;
+    if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
+        %existing = %{$domconfig{'loadbalancing'}};
+    }
+    if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
         push(@prefs_order,'loadbalancing');
     }
     my %prefs = (
@@ -382,11 +386,11 @@ sub handler {
                               col2 => 'Rules'}],
                  },
          'loadbalancing' =>
-                 {text  => 'Dedicated Load Balancer',
+                 {text  => 'Dedicated Load Balancer(s)',
                   help  => 'Domain_Configuration_Load_Balancing',
-                  header => [{col1 => 'Server',
+                  header => [{col1 => 'Balancers',
                               col2 => 'Default destinations',
-                              col3 => 'User affliation',
+                              col3 => 'User affiliation',
                               col4 => 'Overrides'},
                             ],
                  },
@@ -402,26 +406,57 @@ sub handler {
                                         col2 => 'Value'}],
                            };
     }
+
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
     ({href=>"javascript:changePage(document.$phase,'pickactions')",
       text=>"Settings to display/modify"});
     my $confname = $dom.'-domainconfig';
+
     if ($phase eq 'process') {
         &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
     } elsif ($phase eq 'display') {
         my $js = &recaptcha_js();
-        if (keys(%servers) > 1) {
+        if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
             my ($othertitle,$usertypes,$types) =
                 &Apache::loncommon::sorted_inst_types($dom);
-            $js = &lonbalance_targets_js($dom,$types,\%servers).
-                  &new_spares_js().
-                  &common_domprefs_js().
-                  &Apache::loncommon::javascript_array_indexof();
+            $js .= &lonbalance_targets_js($dom,$types,\%servers,
+                                          $domconfig{'loadbalancing'}).
+                   &new_spares_js().
+                   &common_domprefs_js().
+                   &Apache::loncommon::javascript_array_indexof();
         }
         &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js);
     } else {
+# check if domconfig user exists for the domain.
+        my $servadm = $r->dir_config('lonAdmEMail');
+        my ($configuserok,$author_ok,$switchserver) =
+            &config_check($dom,$confname,$servadm);
+        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).
+                      '<br />'
+            );
+            if ($switchserver) {
+                $r->print(&mt('Ordinarily, that domain configuration user is created when the ./UPDATE script is run to install LON-CAPA for the first time.').
+                          '<br />'.
+                          &mt('However, that does not apply when new domains are added to a multi-domain server, and ./UPDATE has not been run recently.').
+                          '<br />'.
+                          &mt('The "[_1]" user can be created automatically when a Domain Coordinator visits the web-based "Set domain configuration" screen, in a session hosted on the primary library server.',$confname).
+                          '<br />'.
+                          &mt('To do that now, use the following link: [_1]',$switchserver)
+                );
+            } else {
+                $r->print(&mt('To create that user from the command line run the ./UPDATE script found in the top level directory of the extracted LON-CAPA tarball.').
+                          '<br />'.
+                          &mt('Once that is done, you will be able to use the web-based "Set domain configuration" to configure the domain')
+                );
+            }
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
         if (keys(%domconfig) == 0) {
             my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
             my @ids=&Apache::lonnet::current_machine_ids();
@@ -804,7 +839,7 @@ sub print_login {
                           '<td><select name="'.$lonhost.'_server">'.
                           '<option value=""'.$direct.'>'.$choices{'directlogin'}.
                           '</option>';
-            foreach my $hostid (keys(%servers)) {
+            foreach my $hostid (sort(keys(%servers))) {
                 next if ($servers{$hostid} eq $servers{$lonhost});
                 my $selected = '';
                 if (ref($disallowed{$lonhost}) eq 'HASH') {
@@ -847,10 +882,11 @@ sub print_login {
     } elsif ($caller eq 'page') {
         my %defaultchecked = ( 
                                'coursecatalog' => 'on',
+                               'helpdesk'      => 'on',
                                'adminmail'     => 'off',
                                'newuser'       => 'off',
                              );
-        my @toggles = ('coursecatalog','adminmail','newuser');
+        my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
         my (%checkedon,%checkedoff);
         foreach my $item (@toggles) {
             if ($defaultchecked{$item} eq 'on') { 
@@ -1054,7 +1090,9 @@ sub print_login {
                 $datatable .= '<input type="file" name="loginhelpurl_add_file" />';
             }
             $datatable .= '</td></tr>';
+            $itemcount ++;
         }
+        $datatable .= &captcha_choice('login',$settings,$itemcount);
     }
     return $datatable;
 }
@@ -1064,6 +1102,7 @@ sub login_choices {
         &Apache::lonlocal::texthash (
             coursecatalog => 'Display Course/Community Catalog link?',
             adminmail     => "Display Administrator's E-mail Address?",
+            helpdesk      => 'Display "Contact Helpdesk" link',
             disallowlogin => "Login page requests redirected",
             hostid        => "Server",
             server        => "Redirect to:",
@@ -1184,13 +1223,12 @@ sub display_color_options {
     } else {
         $datatable .= '<td>&nbsp;</td>';
     }
-    my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'});
+    my $current_color = $designs->{'font'} ? $designs->{'font'} : $defaults->{'font'};
+
     $datatable .= '<td><span class="LC_nobreak">'.
-                  '<input type="text" size="10" name="'.$role.'_font"'.
-                  ' value="'.$designs->{'font'}.'" />&nbsp;'.$fontlink.
-                  '&nbsp;<span id="css_'.$role.'_font" style="background-color: '.
-                  $designs->{'font'}.';">&nbsp;&nbsp;&nbsp;</span>'.
-                  '</span></td></tr>';
+                  '<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
+                  ' value="'.$current_color.'" />&nbsp;'. 
+                  '&nbsp;</td></tr>';
     unless ($role eq 'login') { 
         $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{'fontmenu'}.'</td>';
@@ -1199,13 +1237,13 @@ sub display_color_options {
         } else {
             $datatable .= '<td>&nbsp;</td>';
         }
-        $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'});
+	$current_color = $designs->{'fontmenu'} ? 
+	    $designs->{'fontmenu'} : $defaults->{'fontmenu'};
         $datatable .= '<td><span class="LC_nobreak">'.
-                      '<input type="text" size="10" name="'.$role.'_fontmenu"'.
-                      ' value="'.$designs->{'fontmenu'}.'" />&nbsp;'.$fontlink.
-                      '&nbsp;<span id="css_'.$role.'_fontmenu" style="background-color: '.
-                      $designs->{'fontmenu'}.';">&nbsp;&nbsp;&nbsp;</span>'.
-                      '</span></td></tr>';
+                      '<input class="colorchooser" type="text" size="10" name="'
+		      .$role.'_fontmenu"'.
+                      ' value="'.$current_color.'" />&nbsp;'.
+                      '&nbsp;</td></tr>';
     }
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
@@ -1332,13 +1370,14 @@ sub display_color_options {
     }
     $datatable .= '<td class="LC_right_item">'.
                   '<table border="0"><tr>';
+
     foreach my $item (@{$bgs}) {
-        my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item});
-        $datatable .= '<td align="center">'.$link;
+        $datatable .= '<td align="center">';
+	my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
         if ($designs->{'bgs'}{$item}) {
-            $datatable .= '&nbsp;<span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span>';
+            $datatable .= '&nbsp;';
         }
-        $datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'bgs'}{$item}.
+        $datatable .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
                       '" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
     }
     $datatable .= '</tr></table></td></tr>';
@@ -1360,13 +1399,13 @@ sub display_color_options {
     $datatable .= '<td class="LC_right_item">'.
                   '<table border="0"><tr>';
     foreach my $item (@{$links}) {
-        $datatable .= '<td align="center">'."\n".
-                      &color_pick($phase,$role,$item,$choices->{$item},
-                                  $designs->{'links'}{$item});
+	my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
+        $datatable .= '<td align="center">'."\n";
+
         if ($designs->{'links'}{$item}) {
-            $datatable.='&nbsp;<span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'links'}{$item}.';">&nbsp;&nbsp;&nbsp;</span>';
+            $datatable.='&nbsp;';
         }
-        $datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'links'}{$item}.
+        $datatable .= '<br /><input type="text" size="8" class="colorchooser" name="'.$role.'_'.$item.'" value="'.$color.
                       '" /></td>';
     }
     $$rowtotal += $itemcount;
@@ -1707,9 +1746,7 @@ sub print_quotas {
         } elsif ($context eq 'requestauthor') {
             my $curroption;
             if (ref($settings) eq 'HASH') {
-                if (ref($settings->{'requestauthor'}) eq 'HASH') {
-                    $curroption = $settings->{'requestauthor'};
-                }
+                $curroption = $settings->{'default'};
             }
             if (!$curroption) {
                 $curroption = 'norequest';
@@ -1854,8 +1891,8 @@ sub print_quotas {
                     $checked = ' checked="checked"';
                 }
                 $datatable .= '<span class="LC_nobreak"><label>'.
-                              '<input type="radio" name="crsreq_'.$item.
-                              '__LC_adv" value="'.$val.'"'.$checked.' />'.
+                              '<input type="radio" name="authorreq__LC_adv"'.
+                              ' value="'.$val.'"'.$checked.' />'.
                               $titles{$option}.'</label></span>&nbsp; ';
             }
         } else {
@@ -1889,35 +1926,16 @@ sub print_quotas {
 
 sub print_requestmail {
     my ($dom,$action,$settings,$rowtotal) = @_;
-    my ($now,$datatable,%dompersonnel,@domcoord,@currapproval,$rows);
+    my ($now,$datatable,%currapp,$rows);
     $now = time;
-    $rows = 0;
-    %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now);
-    foreach my $server (keys(%dompersonnel)) {
-        foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
-            my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
-            if (!grep(/^$uname:$udom$/,@domcoord)) {
-                push(@domcoord,$uname.':'.$udom);
-            }
-        }
-    }
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'notify'}) eq 'HASH') {
             if ($settings->{'notify'}{'approval'} ne '') {
-               @currapproval = split(',',$settings->{'notify'}{'approval'});
-            }
-        }
-    }
-    if (@currapproval) {
-        foreach my $dc (@currapproval) {
-            unless (grep(/^\Q$dc\E$/,@domcoord)) {
-                push(@domcoord,$dc);
+               map {$currapp{$_}=1;} split(/,/,$settings->{'notify'}{'approval'});
             }
         }
     }
-    @domcoord = sort(@domcoord);
-    my $numinrow = 4;
-    my $numdc = @domcoord;
+    my $numinrow = 2;
     my $css_class = 'class="LC_odd_row"';
     my $text;
     if ($action eq 'requestcourses') {
@@ -1928,42 +1946,12 @@ sub print_requestmail {
     $datatable = '<tr '.$css_class.'>'.
                  ' <td>'.$text.'</td>'.
                  ' <td class="LC_left_item">';
-    if (@domcoord > 0) {
-        $datatable .= '<table>';
-        for (my $i=0; $i<$numdc; $i++) {
-            my $rem = $i%($numinrow);
-            if ($rem == 0) {
-                if ($i > 0) {
-                    $datatable .= '</tr>';
-                }
-                $datatable .= '<tr>';
-                $rows ++;
-            }
-            my $check = ' ';
-            if (grep(/^\Q$domcoord[$i]\E$/,@currapproval)) {
-                $check = ' checked="checked" ';
-            }
-            my ($uname,$udom) = split(':',$domcoord[$i]);
-            my $fullname = &Apache::loncommon::plainname($uname,$udom);
-            if ($i == $numdc-1) {
-                my $colsleft = $numinrow-$rem;
-                if ($colsleft > 1) {
-                    $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
-                } else {
-                    $datatable .= '<td class="LC_left_item">';
-                }
-            } else {
-                $datatable .= '<td class="LC_left_item">';
-            }
-            $datatable .= '<span class="LC_nobreak"><label>'.
-                          '<input type="checkbox" name="reqapprovalnotify" '.
-                          'value="'.$domcoord[$i].'"'.$check.'/>'.
-                          $fullname.'</label></span></td>';
-        }
-        $datatable .= '</tr></table>';
+    my ($numdc,$table,$rows) = &active_dc_picker($dom,$numinrow,'checkbox',
+                                                 'reqapprovalnotify',%currapp);
+    if ($numdc > 0) {
+        $datatable .= $table;
     } else {
         $datatable .= &mt('There are no active Domain Coordinators');
-        $rows ++;
     }
     $datatable .='</td></tr>';
     $$rowtotal += $rows;
@@ -2118,8 +2106,7 @@ sub print_autoupdate {
 
 sub print_autocreate {
     my ($dom,$settings,$rowtotal) = @_;
-    my (%createon,%createoff);
-    my $curr_dc;
+    my (%createon,%createoff,%currhash);
     my @types = ('xml','req');
     if (ref($settings) eq 'HASH') {
         foreach my $item (@types) {
@@ -2132,7 +2119,9 @@ sub print_autocreate {
                 }
             }
         }
-        $curr_dc = $settings->{'xmldc'};
+        if ($settings->{'xmldc'} ne '') { 
+            $currhash{$settings->{'xmldc'}} = 1;
+        }
     } else {
         foreach my $item (@types) {
             $createoff{$item} = ' checked="checked" ';
@@ -2140,6 +2129,7 @@ sub print_autocreate {
         }
     }
     $$rowtotal += 2;
+    my $numinrow = 2;
     my $datatable='<tr class="LC_odd_row">'.
                   '<td>'.&mt('Create pending official courses from XML files').'</td>'.
                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
@@ -2154,15 +2144,16 @@ sub print_autocreate {
                   $createon{'req'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autocreate_req"'.
                   $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
-    my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc);
+    my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
+                                                   'autocreate_xmldc',%currhash);
     if ($numdc > 1) {
         $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
                       &mt('Course creation processed as: (choose Dom. Coord.)').
                       '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
-        $$rowtotal ++ ;
     } else {
         $datatable .= $dctable.'</td></tr>';
     }
+    $$rowtotal += $rows;
     return $datatable;
 }
 
@@ -2285,7 +2276,7 @@ sub print_contacts {
     my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails,%bccemails);
     my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
-                    'requestsmail');
+                    'requestsmail','updatesmail');
     foreach my $type (@mailings) {
         $otheremails{$type} = '';
     }
@@ -2321,6 +2312,7 @@ sub print_contacts {
         $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;
@@ -2384,7 +2376,7 @@ sub radiobutton_prefs {
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
                    (ref($choices) eq 'HASH'));
 
-    my (%checkedon,%checkedoff,$datatable,$css_class,$cell_colspan);
+    my (%checkedon,%checkedoff,$datatable,$css_class);
 
     foreach my $item (@{$toggles}) {
         if ($defaultchecked->{$item} eq 'on') {
@@ -2751,7 +2743,10 @@ sub spares_row {
             $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
             $datatable .= '<tr'.$css_class.'>
                            <td rowspan="2">
-                            <span class="LC_nobreak"><b>'.$server.'</b> when busy, offloads to:</span></td>'."\n";
+                            <span class="LC_nobreak">'.
+                          &mt('[_1] when busy, offloads to:'
+                              ,'<b>'.$server.'</b>').
+                          "\n";
             my (%current,%canselect);
             my @choices = 
                 &possible_newspares($server,$spareid->{$server},$serverhomes,$altids);
@@ -2875,16 +2870,13 @@ sub print_loadbalancing {
     my $numinrow = 1;
     my $datatable;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my ($currbalancer,$currtargets,$currrules);
-    if (keys(%servers) > 1) {
-        if (ref($settings) eq 'HASH') {
-            $currbalancer = $settings->{'lonhost'};
-            $currtargets = $settings->{'targets'};
-            $currrules = $settings->{'rules'};
-        } else {
-            ($currbalancer,$currtargets) = 
-                &Apache::lonnet::get_lonbalancer_config(\%servers);
-        }
+    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);
     } else {
         return;
     }
@@ -2894,104 +2886,190 @@ sub print_loadbalancing {
     if (ref($types) eq 'ARRAY') {
         $rownum += scalar(@{$types});
     }
-    my $css_class = ' class="LC_odd_row"';
-    my $targets_div_style = 'display: none';
-    my $disabled_div_style = 'display: block';
-    my $homedom_div_style = 'display: none';
-    $datatable = '<tr'.$css_class.'>'.
-                 '<td rowspan="'.$rownum.'" valign="top">'.
-                 '<p><select name="loadbalancing_lonhost" onchange="toggleTargets();">'."\n".
-                 '<option value=""';
-    if (($currbalancer eq '') || (!grep(/^\Q$currbalancer\E$/,keys(%servers)))) {
-        $datatable .= ' selected="selected"';
-    } else {
-        $targets_div_style = 'display: block';
-        $disabled_div_style = 'display: none';
-        if ($dom eq &Apache::lonnet::host_domain($currbalancer)) {
-            $homedom_div_style = 'display: block'; 
-        }
-    }
-    $datatable .= '>'.&mt('None').'</option>'."\n";
-    foreach my $lonhost (sort(keys(%servers))) {
-        my $selected;
-        if ($lonhost eq $currbalancer) {
-            $selected .= ' selected="selected"';
-        }
-        $datatable .= '<option value="'.$lonhost.'"'.$selected.'>'.$lonhost.'</option>'."\n";
-    }
-    $datatable .= '</select></p></td><td rowspan="'.$rownum.'" valign="top">'.
-                  '<div id="loadbalancing_disabled" style="'.$disabled_div_style.'">'.&mt('No dedicated Load Balancer').'</div>'."\n".
-                  '<div id="loadbalancing_targets" style="'.$targets_div_style.'">'.&mt('Offloads to:').'<br />';
-    my ($numspares,@spares) = &count_servers($currbalancer,%servers);
-    my @sparestypes = ('primary','default');
-    my %typetitles = &sparestype_titles();
-    foreach my $sparetype (@sparestypes) {
-        my $targettable;
-        for (my $i=0; $i<$numspares; $i++) {
-            my $checked;
-            if (ref($currtargets) eq 'HASH') {
-                if (ref($currtargets->{$sparetype}) eq 'ARRAY') {
-                    if (grep(/^\Q$spares[$i]\E$/,@{$currtargets->{$sparetype}})) {
-                        $checked = ' checked="checked"';
+    my @css_class = ('LC_odd_row','LC_even_row');
+    my $balnum = 0;
+    my $islast;
+    my (@toshow,$disabledtext);
+    if (keys(%currbalancer) > 0) {
+        @toshow = sort(keys(%currbalancer));
+        if (scalar(@toshow) < scalar(keys(%servers)) + 1) {
+            push(@toshow,'');
+        }
+    } else {
+        @toshow = ('');
+        $disabledtext = &mt('No existing load balancer');
+    }
+    foreach my $lonhost (@toshow) {
+        if ($balnum == scalar(@toshow)-1) {
+            $islast = 1;
+        } else {
+            $islast = 0;
+        }
+        my $cssidx = $balnum%2;
+        my $targets_div_style = 'display: none';
+        my $disabled_div_style = 'display: block';
+        my $homedom_div_style = 'display: none';
+        $datatable .= '<tr class="'.$css_class[$cssidx].'">'.
+                      '<td rowspan="'.$rownum.'" valign="top">'.
+                      '<p>';
+        if ($lonhost eq '') {
+            $datatable .= '<span class="LC_nobreak">'; 
+            if (keys(%currbalancer) > 0) {
+                $datatable .= &mt('Add balancer:');
+            } else {
+                $datatable .= &mt('Enable balancer:');
+            }
+            $datatable .= '&nbsp;'.
+                          '<select name="loadbalancing_lonhost_'.$balnum.'"'.
+                          ' id="loadbalancing_lonhost_'.$balnum.'"'.
+                          ' onchange="toggleTargets('."'$balnum'".');">'."\n".
+                          '<option value="" selected="selected">'.&mt('None').
+                          '</option>'."\n";
+            foreach my $server (sort(keys(%servers))) {
+                next if ($currbalancer{$server});
+                $datatable .= '<option value="'.$server.'">'.$server.'</option>'."\n";
+            }
+            $datatable .= 
+                '</select>'."\n".
+                '<input type="hidden" name="loadbalancing_prevlonhost_'.$balnum.'" id="loadbalancing_prevlonhost_'.$balnum.'" value="" />&nbsp;</span>'."\n";
+        } else {
+            $datatable .= '<i>'.$lonhost.'</i><br /><span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="loadbalancing_delete" value="'.$balnum.'" id="loadbalancing_delete_'.$balnum.'" onclick="javascript:balancerDeleteChange('."'$balnum'".');" />&nbsp;'.
+                           &mt('Stop balancing').'</label>'.
+                           '<input type="hidden" name="loadbalancing_lonhost_'.$balnum.'" value="'.$lonhost.'" id="loadbalancing_lonhost_'.$balnum.'" /></span>';
+            $targets_div_style = 'display: block';
+            $disabled_div_style = 'display: none';
+            if ($dom eq &Apache::lonnet::host_domain($lonhost)) {
+                $homedom_div_style = 'display: block';
+            }
+        }
+        $datatable .= '</p></td><td rowspan="'.$rownum.'" valign="top">'.
+                  '<div id="loadbalancing_disabled_'.$balnum.'" style="'.
+                  $disabled_div_style.'">'.$disabledtext.'</div>'."\n".
+                  '<div id="loadbalancing_targets_'.$balnum.'" style="'.$targets_div_style.'">'.&mt('Offloads to:').'<br />';
+        my ($numspares,@spares) = &count_servers($lonhost,%servers);
+        my @sparestypes = ('primary','default');
+        my %typetitles = &sparestype_titles();
+        foreach my $sparetype (@sparestypes) {
+            my $targettable;
+            for (my $i=0; $i<$numspares; $i++) {
+                my $checked;
+                if (ref($currtargets{$lonhost}) eq 'HASH') {
+                    if (ref($currtargets{$lonhost}{$sparetype}) eq 'ARRAY') {
+                        if (grep(/^\Q$spares[$i]\E$/,@{$currtargets{$lonhost}{$sparetype}})) {
+                            $checked = ' checked="checked"';
+                        }
+                    }
+                }
+                my ($chkboxval,$disabled);
+                if (($lonhost ne '') && (exists($servers{$lonhost}))) {
+                    $chkboxval = $spares[$i];
+                }
+                if (exists($currbalancer{$spares[$i]})) {
+                    $disabled = ' disabled="disabled"';
+                }
+                $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></td>';
+                my $rem = $i%($numinrow);
+                if ($rem == 0) {
+                    if (($i > 0) && ($i < $numspares-1)) {
+                        $targettable .= '</tr>';
+                    }
+                    if ($i < $numspares-1) {
+                        $targettable .= '<tr>';
                     }
                 }
             }
-            my $chkboxval;
-            if (($currbalancer ne '') && (grep((/^\Q$currbalancer\E$/,keys(%servers))))) {
-                $chkboxval = $spares[$i];
-            }
-            $targettable .= '<td><label><input type="checkbox" name="loadbalancing_target_'.$sparetype.'"'.
-                      $checked.' value="'.$chkboxval.'" id="loadbalancing_target_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$sparetype'".');" /><span id="loadbalancing_targettxt_'.$sparetype.'_'.$i.'">&nbsp;'.$chkboxval.
-                      '</span></label></td>';
-            my $rem = $i%($numinrow);
-            if ($rem == 0) {
-                if ($i > 0) {
-                    $targettable .= '</tr>';
-                }
-                $targettable .= '<tr>';
+            if ($targettable ne '') {
+                my $rem = $numspares%($numinrow);
+                my $colsleft = $numinrow - $rem;
+                if ($colsleft > 1 ) {
+                    $targettable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
+                                    '&nbsp;</td>';
+                } elsif ($colsleft == 1) {
+                    $targettable .= '<td class="LC_left_item">&nbsp;</td>';
+                }
+                $datatable .=  '<i>'.$typetitles{$sparetype}.'</i><br />'.
+                               '<table><tr>'.$targettable.'</tr></table><br />';
+            }
+        }
+        $datatable .= '</div></td></tr>'.
+                      &loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
+                                           $othertitle,$usertypes,$types,\%servers,
+                                           \%currbalancer,$lonhost,
+                                           $targets_div_style,$homedom_div_style,
+                                           $css_class[$cssidx],$balnum,$islast);
+        $$rowtotal += $rownum;
+        $balnum ++;
+    }
+    $datatable .= '<input type="hidden" name="loadbalancing_total" id="loadbalancing_total" value="'.$balnum.'" />';
+    return $datatable;
+}
+
+sub get_loadbalancers_config {
+    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'));
+    if (keys(%{$existing}) > 0) {
+        my $oldlonhost;
+        foreach my $key (sort(keys(%{$existing}))) {
+            if ($key eq 'lonhost') {
+                $oldlonhost = $existing->{'lonhost'};
+                $currbalancer->{$oldlonhost} = 1;
+            } elsif ($key eq 'targets') {
+                if ($oldlonhost) {
+                    $currtargets->{$oldlonhost} = $existing->{'targets'};
+                }
+            } elsif ($key eq 'rules') {
+                if ($oldlonhost) {
+                    $currrules->{$oldlonhost} = $existing->{'rules'};
+                }
+            } elsif (ref($existing->{$key}) eq 'HASH') {
+                $currbalancer->{$key} = 1;
+                $currtargets->{$key} = $existing->{$key}{'targets'};
+                $currrules->{$key} = $existing->{$key}{'rules'};
             }
         }
-        if ($targettable ne '') {
-            my $rem = $numspares%($numinrow);
-            my $colsleft = $numinrow - $rem;
-            if ($colsleft > 1 ) {
-                $targettable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
-                                '&nbsp;</td>';
-            } elsif ($colsleft == 1) {
-                $targettable .= '<td class="LC_left_item">&nbsp;</td>';
+    } else {
+        my ($balancerref,$targetsref) =
+                &Apache::lonnet::get_lonbalancer_config($servers);
+        if ((ref($balancerref) eq 'HASH') && (ref($targetsref) eq 'HASH')) {
+            foreach my $server (sort(keys(%{$balancerref}))) {
+                $currbalancer->{$server} = 1;
+                $currtargets->{$server} = $targetsref->{$server};
             }
-            $datatable .=  '<i>'.$typetitles{$sparetype}.'</i><br />'.
-                           '<table><tr>'.$targettable.'</table><br />';
         }
     }
-    $datatable .= '</div></td></tr>'.
-                  &loadbalancing_rules($dom,$intdom,$currrules,$othertitle,
-                                       $usertypes,$types,\%servers,$currbalancer,
-                                       $targets_div_style,$homedom_div_style,$css_class);
-    $$rowtotal += $rownum;
-    return $datatable;
+    return;
 }
 
 sub loadbalancing_rules {
     my ($dom,$intdom,$currrules,$othertitle,$usertypes,$types,$servers,
-        $currbalancer,$targets_div_style,$homedom_div_style,$css_class) = @_;
+        $currbalancer,$lonhost,$targets_div_style,$homedom_div_style,
+        $css_class,$balnum,$islast) = @_;
     my $output;
+    my $num = 0;
     my ($alltypes,$othertypes,$titles) = 
         &loadbalancing_titles($dom,$intdom,$usertypes,$types);
     if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH'))  {
         foreach my $type (@{$alltypes}) {
+            $num ++;
             my $current;
             if (ref($currrules) eq 'HASH') {
                 $current = $currrules->{$type};
             }
             if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
-                if ($dom ne &Apache::lonnet::host_domain($currbalancer)) {
+                if ($dom ne &Apache::lonnet::host_domain($lonhost)) {
                     $current = '';
                 }
             }
             $output .= &loadbalance_rule_row($type,$titles->{$type},$current,
-                                             $servers,$currbalancer,$dom,
-                                             $targets_div_style,$homedom_div_style,$css_class);
+                                             $servers,$currbalancer,$lonhost,$dom,
+                                             $targets_div_style,$homedom_div_style,
+                                             $css_class,$balnum,$num,$islast);
         }
     }
     return $output;
@@ -3028,8 +3106,8 @@ sub loadbalancing_titles {
 }
 
 sub loadbalance_rule_row {
-    my ($type,$title,$current,$servers,$currbalancer,$dom,$targets_div_style,
-        $homedom_div_style,$css_class) = @_;
+    my ($type,$title,$current,$servers,$currbalancer,$lonhost,$dom,
+        $targets_div_style,$homedom_div_style,$css_class,$balnum,$num,$islast) = @_;
     my @rulenames = ('default','homeserver');
     my %ruletitles = &offloadtype_text();
     if ($type eq '_LC_external') {
@@ -3042,9 +3120,15 @@ sub loadbalance_rule_row {
     if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
         $style = $homedom_div_style;
     }
+    my $space;
+    if ($islast && $num == 1) {
+        $space = '<div display="inline-block">&nbsp;</div>';
+    }
     my $output = 
-        '<tr'.$css_class.'><td valign="top"><div id="balanceruletitle_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n".
-        '<td><div id="balancerule_'.$type.'" style="'.$style.'">'."\n";
+        '<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.
+        '<div id="balancerule_'.$balnum.'_'.$type.'" style="'.$style.'">'."\n";
     for (my $i=0; $i<@rulenames; $i++) {
         my $rule = $rulenames[$i];
         my ($checked,$extra);
@@ -3060,17 +3144,20 @@ sub loadbalance_rule_row {
                 unless ($checked) {
                     $default = ' selected="selected"';
                 }
-                $extra = ':&nbsp;<select name="loadbalancing_singleserver_'.$type.
-                         '" id="loadbalancing_singleserver_'.$type.
-                         '" onchange="singleServerToggle('."'$type'".')">'."\n".
-                         '<option value=""'.$default.'></option>'."\n";
-                foreach my $lonhost (sort(keys(%{$servers}))) {
-                    next if ($lonhost eq $currbalancer);
+                $extra = 
+                    ':&nbsp;<select name="loadbalancing_singleserver_'.$balnum.'_'.$type.
+                    '" id="loadbalancing_singleserver_'.$balnum.'_'.$type.
+                    '" onchange="singleServerToggle('."'$balnum','$type'".')">'."\n".
+                    '<option value=""'.$default.'></option>'."\n";
+                foreach my $server (sort(keys(%{$servers}))) {
+                    if (ref($currbalancer) eq 'HASH') {
+                        next if (exists($currbalancer->{$server}));
+                    }
                     my $selected;
-                    if ($lonhost eq $current) {
+                    if ($server eq $current) {
                         $selected = ' selected="selected"';
                     }
-                    $extra .= '<option value="'.$lonhost.'"'.$selected.'>'.$lonhost.'</option>';
+                    $extra .= '<option value="'.$server.'"'.$selected.'>'.$server.'</option>';
                 }
                 $extra .= '</select>';
             }
@@ -3078,9 +3165,9 @@ sub loadbalance_rule_row {
             $checked = ' checked="checked"';
         }
         $output .= '<span class="LC_nobreak"><label>'.
-                   '<input type="radio" name="loadbalancing_rules_'.$type.
-                   '" id="loadbalancing_rules_'.$type.'_'.$i.'" value="'.
-                   $rule.'" onclick="balanceruleChange('."this.form,'$type'".
+                   '<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type.
+                   '" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'.
+                   $rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'".
                    ')"'.$checked.' />&nbsp;'.$ruletitles{$rulenames[$i]}.
                    '</label>'.$extra.'</span><br />'."\n";
     }
@@ -3116,6 +3203,7 @@ sub contact_titles {
                    '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',
@@ -3299,9 +3387,10 @@ sub print_usercreation {
                                              $dom,$numinrow,$othertitle,
                                              'statustocreate');
                 $$rowtotal ++;
+                $rownum ++;
             }
         }
-        $datatable .= &captcha_choice('cancreate',$createsettings);
+        $datatable .= &captcha_choice('cancreate',$createsettings,$rownum);
     } else {
         my @contexts = ('author','course','domain');
         my @authtypes = ('int','krb4','krb5','loc');
@@ -3354,14 +3443,14 @@ sub print_usercreation {
 }
 
 sub captcha_choice {
-    my ($context,$settings) = @_;
+    my ($context,$settings,$itemcount) = @_;
     my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
     if ($context eq 'cancreate') {
         $rowname = &mt('CAPTCHA validation (e-mail as username)');
-    } elsif ($context eq 'help') {
-        $rowname =  &mt('CAPTCHA validation');
+    } elsif ($context eq 'login') {
+        $rowname =  &mt('"Contact helpdesk" CAPTCHA validation');
     }
     if (ref($settings) eq 'HASH') {
         if ($settings->{'captcha'}) {
@@ -3381,8 +3470,9 @@ sub captcha_choice {
     } else {
         $checked{'original'} = ' checked="checked"';
     }
-    my $output = '<tr class="LC_odd_row">'.
-                 '<td class="LC_left_item">'.$rowname.'</td><td class="LC_right_item" colspan="2">'."\n".
+    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="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="'.
@@ -4076,7 +4166,7 @@ sub print_serverstatuses {
 
 sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
-            'clusterstatus','metadata_keywords','metadata_harvest',
+            'checksums','clusterstatus','metadata_keywords','metadata_harvest',
             'takeoffline','takeonline','showenv','toggledebug','ping','domconf');
 }
 
@@ -4531,6 +4621,7 @@ sub modify_login {
         %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);
     %title = ( coursecatalog => 'Display course catalog',
                adminmail => 'Display administrator E-mail address',
+               helpdesk  => 'Display "Contact Helpdesk" link',
                newuser => 'Link for visitors to create a user account',
                loginheader => 'Log-in box header');
     @offon = ('off','on');
@@ -4543,7 +4634,7 @@ sub modify_login {
     }
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
-    my @toggles = ('coursecatalog','adminmail','newuser');
+    my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
     foreach my $item (@toggles) {
         $loginhash{login}{$item} = $env{'form.'.$item};
     }
@@ -4613,7 +4704,6 @@ sub modify_login {
                                 $new = ''; 
                             }
                         }
-
                         $loginhash{login}{loginvia}{$lonhost}{$item} = $new;
                     }
                 }
@@ -4724,6 +4814,7 @@ sub modify_login {
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
+    &process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'});
 
     my $defaulthelpfile = '/adm/loginproblems.html';
     my $defaulttext = &mt('Default in use');
@@ -4731,9 +4822,10 @@ sub modify_login {
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
-        my @toggles = ('coursecatalog','adminmail','newuser');
+        my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
         my %defaultchecked = (
                     'coursecatalog' => 'on',
+                    'helpdesk'      => 'on',
                     'adminmail'     => 'off',
                     'newuser'       => 'off',
         );
@@ -4819,6 +4911,42 @@ sub modify_login {
                             }
                         }
                     }
+                } elsif ($item eq 'captcha') {
+                    if (ref($loginhash{'login'}) eq 'HASH') {
+                        my $chgtxt; 
+                        if ($loginhash{'login'}{$item} eq 'notused') {
+                            $chgtxt .= &mt('No CAPTCHA validation in use for helpdesk form.');
+                        } else {
+                            my %captchas = &captcha_phrases();
+                            if ($captchas{$loginhash{'login'}{$item}}) {
+                                $chgtxt .= &mt("Validation for helpdesk form set to $captchas{$loginhash{'login'}{$item}}.");
+                            } else {
+                                $chgtxt .= &mt('Validation for helpdesk form set to unknown type.');
+                            }
+                        }
+                        $resulttext .= '<li>'.$chgtxt.'</li>';
+                    }
+                } elsif ($item eq 'recaptchakeys') {
+                    if (ref($loginhash{'login'}) eq 'HASH') {
+                        my ($privkey,$pubkey);
+                        if (ref($loginhash{'login'}{$item}) eq 'HASH') {
+                            $pubkey = $loginhash{'login'}{$item}{'public'};
+                            $privkey = $loginhash{'login'}{$item}{'private'};
+                        }
+                        my $chgtxt .= &mt('ReCAPTCHA keys changes').'<ul>';
+                        if (!$pubkey) {
+                            $chgtxt .= '<li>'.&mt('Public key deleted').'</li>';
+                        } else {
+                            $chgtxt .= '<li>'.&mt('Public key set to [_1]',$pubkey).'</li>';
+                        }
+                        if (!$privkey) {
+                            $chgtxt .= '<li>'.&mt('Private key deleted').'</li>';
+                        } else {
+                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
+                        }
+                        $chgtxt .= '</ul>';
+                        $resulttext .= '<li>'.$chgtxt.'</li>';
+                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -5442,7 +5570,7 @@ sub write_metadata {
         print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
         my $mfh;
         if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
-            foreach (sort keys %metadatafields) {
+            foreach (sort(keys(%metadatafields))) {
                 unless ($_=~/\./) {
                     my $unikey=$_;
                     $unikey=~/^([A-Za-z]+)/;
@@ -5526,7 +5654,7 @@ sub check_switchserver {
     my @ids=&Apache::lonnet::current_machine_ids();
     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
     if (!$allowed) {
-	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
+	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&amp;role=dc./'.$dom.'/&amp;destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>';
     }
     return $switchserver;
 }
@@ -5796,6 +5924,10 @@ sub modify_quotas {
                                         $cond = $conditions{$inconf{$type}};
                                     }
                                     $resulttext .= '<li>'.&mt('Set to be available to [_1].',$typetitle).' '.$cond.'</li>';
+                                } elsif ($context eq 'requestauthor') {
+                                    $resulttext .= '<li>'.&mt('Set to "[_1]" for "[_2]".',
+                                                             $titles{$inconf{$type}},$typetitle);
+
                                 } else {
                                     $resulttext .= '<li>'.&mt('Set to be available to [_1]',$typetitle).'</li>';
                                 }
@@ -6169,13 +6301,16 @@ sub modify_autocreate {
             foreach my $item (@types) {
                 if ($changes{$item}) {
                     my $newtxt = $offon[$newvals{$item}];
-                    $resulttext .= '<li>'.&mt("$title{$item} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>';
+                    $resulttext .= '<li>'.
+                                   &mt("$title{$item} set to [_1]$newtxt [_2]",
+                                       '<b>','</b>').
+                                   '</li>';
                 }
             }
             if ($changes{'xmldc'}) {
                 my ($dcname,$dcdom) = split(':',$newvals{'xmldc'});
                 my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom);
-                $resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>'; 
+                $resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]",'<b>'.$newtxt.'</b>').'</li>'; 
             }
             $resulttext .= '</ul>';
         } else {
@@ -6321,7 +6456,11 @@ sub modify_directorysrch {
                         } else {
                             $chgtext =~ s/\; $//;
                         }
-                        $resulttext .= '<li>'.&mt("Users from domain '<span class=\"LC_cusr_emph\">[_1]</span>' permitted to search the institutional directory set to: [_2]",$dom,$chgtext).'</li>';
+                        $resulttext .= 
+                            '<li>'.
+                            &mt("Users from domain '[_1]' permitted to search the institutional directory set to: [_2]",
+                                '<span class="LC_cusr_emph">'.$dom.'</span>',$chgtext).
+                            '</li>';
                     }
                 }
             }
@@ -6349,7 +6488,7 @@ sub modify_directorysrch {
                     }
                 }
                 $chgtext =~ s/\; $//;
-                $resulttext .= '<li>'.&mt("$title{'searchtypes'} set to: \"[_1]\"",$chgtext).'</li>';
+                $resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>';
             }
             $resulttext .= '</ul>';
         } else {
@@ -6373,7 +6512,7 @@ sub modify_contacts {
     my (%others,%to,%bcc);
     my @contacts = ('supportemail','adminemail');
     my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
-                    'requestsmail');
+                    'requestsmail','updatesmail');
     foreach my $type (@mailings) {
         @{$newsetting{$type}} = 
             &Apache::loncommon::get_env_multiple('form.'.$type);
@@ -6429,6 +6568,7 @@ sub modify_contacts {
         $default{'helpdeskmail'} = 'supportemail';
         $default{'lonstatusmail'} = 'adminemail';
         $default{'requestsmail'} = 'adminemail';
+        $default{'updatesmail'} = 'adminemail';
         foreach my $item (@contacts) {
            if ($to{$item} ne $default{$item}) {
               $changes{$item} = 1;
@@ -6911,30 +7051,46 @@ sub process_captcha {
         $newsettings->{'captcha'} = 'original';
     }
     if ($current->{'captcha'} ne $newsettings->{'captcha'}) {
-        if (ref($changes->{'cancreate'}) eq 'ARRAY') {
-            push(@{$changes->{'cancreate'}},'captcha');
-        } elsif (!defined($changes->{'cancreate'})) {
-            $changes->{'cancreate'} = ['captcha'];
+        if ($container eq 'cancreate') { 
+            if (ref($changes->{'cancreate'}) eq 'ARRAY') {
+                push(@{$changes->{'cancreate'}},'captcha');
+            } elsif (!defined($changes->{'cancreate'})) {
+                $changes->{'cancreate'} = ['captcha'];
+            }
+        } else {
+            $changes->{'captcha'} = 1;
         }
     }
     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;
+        $newsettings->{'recaptchakeys'} = {
+                                             public  => $newpub,
+                                             private => $newpriv,
+                                          };
     }
-    $newsettings->{'recaptchakeys'} = {
-                                         public  => $newpub,
-                                         private => $newpriv,
-                                      };
     if (ref($current->{'recaptchakeys'}) eq 'HASH') {
         $currpub = $current->{'recaptchakeys'}{'public'};
         $currpriv = $current->{'recaptchakeys'}{'private'};
+        unless ($newsettings->{'captcha'} eq 'recaptcha') {
+            $newsettings->{'recaptchakeys'} = {
+                                                 public  => '',
+                                                 private => '',
+                                              }
+        }
     }
     if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
-        if (ref($changes->{'cancreate'}) eq 'ARRAY') {
-            push(@{$changes->{'cancreate'}},'recaptchakeys');
-        } elsif (!defined($changes->{'cancreate'})) {
-            $changes->{'cancreate'} = ['recaptchakeys'];
+        if ($container eq 'cancreate') {
+            if (ref($changes->{'cancreate'}) eq 'ARRAY') {
+                push(@{$changes->{'cancreate'}},'recaptchakeys');
+            } elsif (!defined($changes->{'cancreate'})) {
+                $changes->{'cancreate'} = ['recaptchakeys'];
+            }
+        } else {
+            $changes->{'recaptchakeys'} = 1; 
         }
     }
     return;
@@ -8010,186 +8166,192 @@ sub modify_loadbalancing {
     my @sparestypes = ('primary','default');
     my %typetitles = &sparestype_titles();
     my $resulttext;
-    if (keys(%servers) > 1) {
-        my ($currbalancer,$currtargets,$currrules);
-        if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
-            $currbalancer = $domconfig{'loadbalancing'}{'lonhost'};
-            $currtargets = $domconfig{'loadbalancing'}{'targets'};
-            $currrules = $domconfig{'loadbalancing'}{'rules'};
-        } else {
-            ($currbalancer,$currtargets) = 
-                &Apache::lonnet::get_lonbalancer_config(\%servers);
-        }
-        my ($saveloadbalancing,%defaultshash,%changes);
-        my ($alltypes,$othertypes,$titles) =
-            &loadbalancing_titles($dom,$intdom,$usertypes,$types);
-        my %ruletitles = &offloadtype_text();
-        my $balancer = $env{'form.loadbalancing_lonhost'};
-        if (!$servers{$balancer}) {
-            undef($balancer);
-        }
-        if ($currbalancer ne $balancer) {
-            $changes{'lonhost'} = 1;
-        }
-        $defaultshash{'loadbalancing'}{'lonhost'} = $balancer;
-        if ($balancer ne '') {
-            unless (ref($domconfig{'loadbalancing'}) eq 'HASH') {
-                $saveloadbalancing = 1;
+    my (%currbalancer,%currtargets,%currrules,%existing);
+    if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
+        %existing = %{$domconfig{'loadbalancing'}};
+    }
+    &get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
+                              \%currtargets,\%currrules);
+    my ($saveloadbalancing,%defaultshash,%changes);
+    my ($alltypes,$othertypes,$titles) =
+        &loadbalancing_titles($dom,$intdom,$usertypes,$types);
+    my %ruletitles = &offloadtype_text();
+    my @deletions = &Apache::loncommon::get_env_multiple('form.loadbalancing_delete');
+    for (my $i=0; $i<$env{'form.loadbalancing_total'}; $i++) {
+        my $balancer = $env{'form.loadbalancing_lonhost_'.$i};
+        if ($balancer eq '') {
+            next;
+        }
+        if (!exists($servers{$balancer})) { 
+            if (exists($currbalancer{$balancer})) {
+                push(@{$changes{'delete'}},$balancer);
             }
-            foreach my $sparetype (@sparestypes) {
-                my @targets = &Apache::loncommon::get_env_multiple('form.loadbalancing_target_'.$sparetype);
-                my @offloadto;
-                foreach my $target (@targets) {
-                    if (($servers{$target}) && ($target ne $balancer)) {
-                        if ($sparetype eq 'default') {
-                            if (ref($defaultshash{'loadbalancing'}{'targets'}{'primary'}) eq 'ARRAY') {
-                                next if (grep(/^\Q$target\E$/,@{$defaultshash{'loadbalancing'}{'targets'}{'primary'}}));
-                            }
-                        }
-                        unless(grep(/^\Q$target\E$/,@offloadto)) {
-                            push(@offloadto,$target);
+            next;
+        }
+        if ((@deletions > 0) && (grep(/^\Q$i\E$/,@deletions))) {
+            push(@{$changes{'delete'}},$balancer);
+            next;
+        }
+        if (!exists($currbalancer{$balancer})) {
+            push(@{$changes{'add'}},$balancer);
+        }
+        $defaultshash{'loadbalancing'}{$balancer}{'targets'}{'primary'} = [];
+        $defaultshash{'loadbalancing'}{$balancer}{'targets'}{'default'} = [];
+        $defaultshash{'loadbalancing'}{$balancer}{'rules'} = {};
+        unless (ref($domconfig{'loadbalancing'}) eq 'HASH') {
+            $saveloadbalancing = 1;
+        }
+        foreach my $sparetype (@sparestypes) {
+            my @targets = &Apache::loncommon::get_env_multiple('form.loadbalancing_target_'.$i.'_'.$sparetype);
+            my @offloadto;
+            foreach my $target (@targets) {
+                if (($servers{$target}) && ($target ne $balancer)) {
+                    if ($sparetype eq 'default') {
+                        if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{'primary'}) eq 'ARRAY') {
+                            next if (grep(/^\Q$target\E$/,@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{'primary'}}));
                         }
                     }
-                    $defaultshash{'loadbalancing'}{'targets'}{$sparetype} = \@offloadto;
+                    unless(grep(/^\Q$target\E$/,@offloadto)) {
+                        push(@offloadto,$target);
+                    }
                 }
-            }
-        } else {
-            foreach my $sparetype (@sparestypes) {
-                $defaultshash{'loadbalancing'}{'targets'}{$sparetype} = [];
+                $defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
             }
         }
-        if (ref($currtargets) eq 'HASH') {
+        if (ref($currtargets{$balancer}) eq 'HASH') {
             foreach my $sparetype (@sparestypes) {
-                if (ref($currtargets->{$sparetype}) eq 'ARRAY') {
-                    my @targetdiffs = &Apache::loncommon::compare_arrays($currtargets->{$sparetype},$defaultshash{'loadbalancing'}{'targets'}{$sparetype});
+                if (ref($currtargets{$balancer}{$sparetype}) eq 'ARRAY') {
+                    my @targetdiffs = &Apache::loncommon::compare_arrays($currtargets{$balancer}{$sparetype},$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype});
                     if (@targetdiffs > 0) {
-                        $changes{'targets'} = 1;
+                        $changes{'curr'}{$balancer}{'targets'} = 1;
                     }
-                } elsif (ref($defaultshash{'loadbalancing'}{'targets'}{$sparetype}) eq 'ARRAY') {
-                    if (@{$defaultshash{'loadbalancing'}{'targets'}{$sparetype}} > 0) {
-                        $changes{'targets'} = 1;
+                } elsif (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {
+                    if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) {
+                        $changes{'curr'}{$balancer}{'targets'} = 1;
                     }
                 }
             }
         } else {
-            foreach my $sparetype (@sparestypes) {
-                if (ref($defaultshash{'loadbalancing'}{'targets'}{$sparetype}) eq 'ARRAY') {
-                    if (@{$defaultshash{'loadbalancing'}{'targets'}{$sparetype}} > 0) {
-                        $changes{'targets'} = 1;  
+            if (ref($defaultshash{'loadbalancing'}{$balancer}) eq 'HASH') {
+                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 ($balancer ne '') {
-            if (&Apache::lonnet::host_domain($balancer) eq $dom) {
-                $ishomedom = 1;
-            }
+        if (&Apache::lonnet::host_domain($balancer) eq $dom) {
+            $ishomedom = 1;
         }
         if (ref($alltypes) eq 'ARRAY') {
             foreach my $type (@{$alltypes}) {
                 my $rule;
-                if ($balancer ne '') {
-                    unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) && 
+                unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) && 
                          (!$ishomedom)) {
-                        $rule = $env{'form.loadbalancing_rules_'.$type};
-                    }
-                    if ($rule eq 'specific') {
-                        $rule = $env{'form.loadbalancing_singleserver_'.$type};
-                    }
+                    $rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type};
+                }
+                if ($rule eq 'specific') {
+                    $rule = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
                 }
-                $defaultshash{'loadbalancing'}{'rules'}{$type} = $rule;
-                if (ref($currrules) eq 'HASH') {
-                    if ($rule ne $currrules->{$type}) {
-                        $changes{'rules'}{$type} = 1;
+                $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule;
+                if (ref($currrules{$balancer}) eq 'HASH') {
+                    if ($rule ne $currrules{$balancer}{$type}) {
+                        $changes{'curr'}{$balancer}{'rules'}{$type} = 1;
                     }
                 } elsif ($rule ne '') {
-                    $changes{'rules'}{$type} = 1;
+                    $changes{'curr'}{$balancer}{'rules'}{$type} = 1;
                 }
             }
         }
-        my $nochgmsg = &mt('No changes made to Load Balancer settings.');
-        if ((keys(%changes) > 0) || ($saveloadbalancing)) {
-            my $putresult = &Apache::lonnet::put_dom('configuration',
-                                                     \%defaultshash,$dom);
-            if ($putresult eq 'ok') {
-                if (keys(%changes) > 0) {
-                    if ($changes{'lonhost'}) {
-                        if ($currbalancer ne '') {
-                            &Apache::lonnet::remote_devalidate_cache($currbalancer,'loadbalancing',$dom);
-                        }
-                        if ($balancer eq '') {
-                            $resulttext .= '<li>'.&mt('Load Balancing with dedicated server discontinued').'</li>'; 
-                        } else {
-                            &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
-                            $resulttext .= '<li>'.&mt('Dedicated Load Balancer server set to [_1]',$balancer);
-                        }
-                    } else {
+    }
+    my $nochgmsg = &mt('No changes made to Load Balancer settings.');
+    if ((keys(%changes) > 0) || ($saveloadbalancing)) {
+        unless (ref($defaultshash{'loadbalancing'}) eq 'HASH') {
+            $defaultshash{'loadbalancing'} = {};
+        }
+        my $putresult = &Apache::lonnet::put_dom('configuration',
+                                                 \%defaultshash,$dom);
+ 
+        if ($putresult eq 'ok') {
+            if (keys(%changes) > 0) {
+                if (ref($changes{'delete'}) eq 'ARRAY') {
+                    foreach my $balancer (sort(@{$changes{'delete'}})) {
+                        $resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>';
                         &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
                     }
-                    if (($changes{'targets'}) && ($balancer ne '')) {
-                        my %offloadstr;
-                        foreach my $sparetype (@sparestypes) {
-                            if (ref($defaultshash{'loadbalancing'}{'targets'}{$sparetype}) eq 'ARRAY') {
-                                if (@{$defaultshash{'loadbalancing'}{'targets'}{$sparetype}} > 0) {
-                                    $offloadstr{$sparetype} = join(', ',@{$defaultshash{'loadbalancing'}{'targets'}{$sparetype}});
+                }
+                if (ref($changes{'add'}) eq 'ARRAY') {
+                    foreach my $balancer (sort(@{$changes{'add'}})) {   
+                        $resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer);
+                    }
+                }
+                if (ref($changes{'curr'}) eq 'HASH') {
+                    foreach my $balancer (sort(keys(%{$changes{'curr'}}))) {
+                        if (ref($changes{'curr'}{$balancer}) eq 'HASH') {
+                            if ($changes{'curr'}{$balancer}{'targets'}) {
+                                my %offloadstr;
+                                foreach my $sparetype (@sparestypes) {
+                                    if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {
+                                        if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) {
+                                            $offloadstr{$sparetype} = join(', ',@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}});
+                                        }
+                                    }
                                 }
-                            }
-                        }
-                        if (keys(%offloadstr) == 0) {
-                            $resulttext .= '<li>'.&mt("Servers to which Load Balance server offloads set to 'None', by default").'</li>';
-                        } else {
-                            my $showoffload;
-                            foreach my $sparetype (@sparestypes) {
-                                $showoffload .= '<i>'.$typetitles{$sparetype}.'</i>:&nbsp;';
-                                if (defined($offloadstr{$sparetype})) {
-                                    $showoffload .= $offloadstr{$sparetype};
+                                if (keys(%offloadstr) == 0) {
+                                    $resulttext .= '<li>'.&mt("Servers to which Load Balance server offloads set to 'None', by default").'</li>';
                                 } else {
-                                    $showoffload .= &mt('None');
+                                    my $showoffload;
+                                    foreach my $sparetype (@sparestypes) {
+                                        $showoffload .= '<i>'.$typetitles{$sparetype}.'</i>:&nbsp;';
+                                        if (defined($offloadstr{$sparetype})) {
+                                            $showoffload .= $offloadstr{$sparetype};
+                                        } else {
+                                            $showoffload .= &mt('None');
+                                        }
+                                        $showoffload .= ('&nbsp;'x3);
+                                    }
+                                    $resulttext .= '<li>'.&mt('By default, Load Balancer: [_1] set to offload to - [_2]',$balancer,$showoffload).'</li>';
                                 }
-                                $showoffload .= ('&nbsp;'x3);
                             }
-                            $resulttext .= '<li>'.&mt('By default, Load Balancer server set to offload to: [_1]',$showoffload).'</li>';
                         }
-                    }
-                    if ((ref($changes{'rules'}) eq 'HASH') && ($balancer ne '')) {
-                        if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) {
-                            foreach my $type (@{$alltypes}) {
-                                if ($changes{'rules'}{$type}) {
-                                    my $rule = $defaultshash{'loadbalancing'}{'rules'}{$type};
-                                    my $balancetext;
-                                    if ($rule eq '') {
-                                        $balancetext =  $ruletitles{'default'};
-                                    } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer')) {
-                                        $balancetext =  $ruletitles{$rule};
-                                    } else {
-                                        $balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{'rules'}{$type});
+                        if (ref($changes{'curr'}{$balancer}{'rules'}) eq 'HASH') {
+                            if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) {
+                                foreach my $type (@{$alltypes}) {
+                                    if ($changes{'curr'}{$balancer}{'rules'}{$type}) {
+                                        my $rule = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type};
+                                        my $balancetext;
+                                        if ($rule eq '') {
+                                            $balancetext =  $ruletitles{'default'};
+                                        } 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 Balancing for [_1] set to: [_2]',$titles->{$type},$balancetext).'</li>';     
                                 }
                             }
                         }
+                        &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
                     }
-                    if ($resulttext ne '') {
-                        $resulttext = &mt('Changes made:').'<ul>'.$resulttext.'</ul>';
-                    } else {
-                        $resulttext = $nochgmsg;
-                    }
+                }
+                if ($resulttext ne '') {
+                    $resulttext = &mt('Changes made:').'<ul>'.$resulttext.'</ul>';
                 } else {
                     $resulttext = $nochgmsg;
-                    if ($balancer ne '') {
-                        &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
-                    }
                 }
             } else {
-                $resulttext = '<span class="LC_error">'.
-                              &mt('An error occurred: [_1]',$putresult).'</span>';
+                $resulttext = $nochgmsg;
             }
         } else {
-            $resulttext = $nochgmsg;
+            $resulttext = '<span class="LC_error">'.
+                          &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext =  &mt('Load Balancing unavailable as this domain only has one server.');
+        $resulttext = $nochgmsg;
     }
     return $resulttext;
 }
@@ -8236,72 +8398,95 @@ sub recurse_cat_deletes {
 
 sub get_active_dcs {
     my ($dom) = @_;
-    my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);
+    my $now = time;
+    my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now);
     my %domcoords;
     my $numdcs = 0;
     my $now = time;
     foreach my $server (keys(%dompersonnel)) {
         foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
             my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
-            my ($end,$start) = split(':',$dompersonnel{$server}{$user});
-            if (($end eq '') || ($end == 0) || ($end > $now)) {
-                if ($start <= $now) {
-                    $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
-                }
-            }
+            $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
         }
     }
     return %domcoords;
 }
 
 sub active_dc_picker {
-    my ($dom,$curr_dc) = @_;
+    my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
     my %domcoords = &get_active_dcs($dom); 
-    my @dcs = sort(keys(%domcoords));
-    my $numdcs = scalar(@dcs); 
-    my $datatable;
-    my $numinrow = 2;
+    my @domcoord = keys(%domcoords);
+    if (keys(%currhash)) {
+        foreach my $dc (keys(%currhash)) {
+            unless (exists($domcoords{$dc})) {
+                push(@domcoord,$dc);
+            }
+        }
+    }
+    @domcoord = sort(@domcoord);
+    my $numdcs = scalar(@domcoord); 
+    my $rows = 0;
+    my $table;
     if ($numdcs > 1) {
-        $datatable = '<table>';
-        for (my $i=0; $i<@dcs; $i++) {
+        $table = '<table>';
+        for (my $i=0; $i<@domcoord; $i++) {
             my $rem = $i%($numinrow);
             if ($rem == 0) {
                 if ($i > 0) {
-                    $datatable .= '</tr>';
+                    $table .= '</tr>';
                 }
-                $datatable .= '<tr>';
+                $table .= '<tr>';
+                $rows ++;
             }
-            my $check = ' ';
-            if ($curr_dc eq '') {
-                if (!$i) { 
-                    $check = ' checked="checked" ';
+            my $check = '';
+            if ($inputtype eq 'radio') {
+                if (keys(%currhash) == 0) {
+                    if (!$i) {
+                        $check = ' checked="checked"';
+                    }
+                } elsif (exists($currhash{$domcoord[$i]})) {
+                    $check = ' checked="checked"';
+                }
+            } else {
+                if (exists($currhash{$domcoord[$i]})) {
+                    $check = ' checked="checked"';
                 }
-            } elsif ($dcs[$i] eq $curr_dc) {
-                $check = ' checked="checked" ';
             }
-            if ($i == @dcs - 1) {
+            if ($i == @domcoord - 1) {
                 my $colsleft = $numinrow - $rem;
                 if ($colsleft > 1) {
-                    $datatable .= '<td colspan="'.$colsleft.'">';
+                    $table .= '<td class="LC_left_item" colspan="'.$colsleft.'">';
                 } else {
-                    $datatable .= '<td>';
+                    $table .= '<td class="LC_left_item">';
                 }
             } else {
-                $datatable .= '<td>';
+                $table .= '<td class="LC_left_item">';
+            }
+            my ($dcname,$dcdom) = split(':',$domcoord[$i]);
+            my $user = &Apache::loncommon::plainname($dcname,$dcdom);
+            $table .= '<span class="LC_nobreak"><label>'.
+                      '<input type="'.$inputtype.'" name="'.$name.'"'.
+                      ' value="'.$domcoord[$i].'"'.$check.' />'.$user;
+            if ($user ne $dcname.':'.$dcdom) {
+                $table .=  ' ('.$dcname.':'.$dcdom.')'.
+                           '</label></span></td>';
             }
-            my ($dcname,$dcdom) = split(':',$dcs[$i]);
-            $datatable .= '<span class="LC_nobreak"><label>'.
-                          '<input type="radio" name="autocreate_xmldc"'.
-                          ' value="'.$dcs[$i].'"'.$check.'/>'.
-                          &Apache::loncommon::plainname($dcname,$dcdom).
-                          '</label></span></td>';
         }
-        $datatable .= '</tr></table>';
-    } elsif (@dcs) {
-        $datatable .= '<input type="hidden" name="autocreate_dc" value="'.
-                      $dcs[0].'" />';
+        $table .= '</tr></table>';
+    } elsif ($numdcs == 1) {
+        if ($inputtype eq 'radio') {
+            $table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />';
+        } else {
+            my $check;
+            if (exists($currhash{$domcoord[0]})) {
+                $check = ' checked="checked"';
+            }
+            $table .= '<input type="checkbox" name="'.$name.'" '.
+                      'value="'.$domcoord[0].'"'.$check.' />';
+            $rows ++;
+        }
     }
-    return ($numdcs,$datatable);
+    return ($numdcs,$table,$rows);
 }
 
 sub usersession_titles {
@@ -8345,7 +8530,7 @@ sub count_servers {
 }
 
 sub lonbalance_targets_js {
-    my ($dom,$types,$servers) = @_;
+    my ($dom,$types,$servers,$settings) = @_;
     my $select = &mt('Select');
     my ($alltargets,$allishome,$allinsttypes,@alltypes);
     if (ref($servers) eq 'HASH') {
@@ -8367,39 +8552,71 @@ sub lonbalance_targets_js {
     }
     push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external');
     $allinsttypes = join("','",@alltypes);
+    my (%currbalancer,%currtargets,%currrules,%existing);
+    if (ref($settings) eq 'HASH') {
+        %existing = %{$settings};
+    }
+    &get_loadbalancers_config($servers,\%existing,\%currbalancer,
+                              \%currtargets,\%currrules);
+    my $balancers = join("','",sort(keys(%currbalancer))); 
     return <<"END";
 
 <script type="text/javascript">
 // <![CDATA[
 
-function toggleTargets() {
-    var balancer = document.display.loadbalancing_lonhost.options[document.display.loadbalancing_lonhost.selectedIndex].value;
+currBalancers = new Array('$balancers');
+
+function toggleTargets(balnum) {
+    var lonhostitem = document.getElementById('loadbalancing_lonhost_'+balnum);
+    var prevhostitem = document.getElementById('loadbalancing_prevlonhost_'+balnum);
+    var balancer = lonhostitem.options[lonhostitem.selectedIndex].value;
+    var prevbalancer = prevhostitem.value;
+    var baltotal = document.getElementById('loadbalancing_total').value;
+    prevhostitem.value = balancer;
+    if (prevbalancer != '') {
+        var prevIdx = currBalancers.indexOf(prevbalancer);
+        if (prevIdx != -1) {
+            currBalancers.splice(prevIdx,1);
+        }
+    }
     if (balancer == '') {
-        hideSpares();
+        hideSpares(balnum);
     } else {
+        var currIdx = currBalancers.indexOf(balancer);
+        if (currIdx == -1) {
+            currBalancers.push(balancer);
+        }
         var homedoms = new Array('$allishome');
-        var ishomedom = homedoms[document.display.loadbalancing_lonhost.selectedIndex];
-        showSpares(balancer,ishomedom);
+        var ishomedom = homedoms[lonhostitem.selectedIndex];
+        showSpares(balancer,ishomedom,balnum);
     }
+    balancerChange(balnum,baltotal,'change',prevbalancer,balancer);
     return;
 }
 
-function showSpares(balancer,ishomedom) {
+function showSpares(balancer,ishomedom,balnum) {
     var alltargets = new Array('$alltargets');
     var insttypes = new Array('$allinsttypes');
     var offloadtypes = new Array('primary','default');
 
-    document.getElementById('loadbalancing_targets').style.display='block';
-    document.getElementById('loadbalancing_disabled').style.display='none';
+    document.getElementById('loadbalancing_targets_'+balnum).style.display='block';
+    document.getElementById('loadbalancing_disabled_'+balnum).style.display='none';
  
     for (var i=0; i<offloadtypes.length; i++) {
         var count = 0;
         for (var j=0; j<alltargets.length; j++) {
             if (alltargets[j] != balancer) {
-                document.getElementById('loadbalancing_target_'+offloadtypes[i]+'_'+count).value = alltargets[j];
-                document.getElementById('loadbalancing_targettxt_'+offloadtypes[i]+'_'+count).style.textAlign='left';
-                document.getElementById('loadbalancing_targettxt_'+offloadtypes[i]+'_'+count).style.textFace='normal';
-                document.getElementById('loadbalancing_targettxt_'+offloadtypes[i]+'_'+count).innerHTML = alltargets[j];
+                var item = document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+count);
+                item.value = alltargets[j];
+                item.style.textAlign='left';
+                item.style.textFace='normal';
+                document.getElementById('loadbalancing_targettxt_'+balnum+'_'+offloadtypes[i]+'_'+count).innerHTML = alltargets[j];
+                if (currBalancers.indexOf(alltargets[j]) == -1) {
+                    item.disabled = '';
+                } else {
+                    item.disabled = 'disabled';
+                    item.checked = false;
+                }
                 count ++;
             }
         }
@@ -8407,25 +8624,29 @@ function showSpares(balancer,ishomedom)
     for (var k=0; k<insttypes.length; k++) {
         if ((insttypes[k] == '_LC_external') || (insttypes[k] == '_LC_internetdom')) {
             if (ishomedom == 1) {
-                document.getElementById('balanceruletitle_'+insttypes[k]).style.display='block';
-                document.getElementById('balancerule_'+insttypes[k]).style.display='block';
+                document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block';
+                document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='block';
             } else {
-                document.getElementById('balanceruletitle_'+insttypes[k]).style.display='none';
-                document.getElementById('balancerule_'+insttypes[k]).style.display='none';
+                document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none';
+                document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none';
 
             }
         } else {
-            document.getElementById('balanceruletitle_'+insttypes[k]).style.display='block';
-            document.getElementById('balancerule_'+insttypes[k]).style.display='block';
+            document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block';
+            document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='block';
         }
         if ((insttypes[k] != '_LC_external') && 
             ((insttypes[k] != '_LC_internetdom') ||
              ((insttypes[k] == '_LC_internetdom') && (ishomedom == 1)))) {
-            document.getElementById('loadbalancing_singleserver_'+insttypes[k]).options[0] = new Option("","",true,true);
+            var item = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]);
+            item.options.length = 0;
+            item.options[0] = new Option("","",true,true);
+            var idx = 0;  
             for (var m=0; m<alltargets.length; m++) {
-                var idx = m+1;
-                if (alltargets[m] != balancer) {
-                    document.getElementById('loadbalancing_singleserver_'+insttypes[k]).options[idx] = new Option(alltargets[m],alltargets[m],false,false);
+                if ((currBalancers.indexOf(alltargets[m]) == -1) && (alltargets[m] != balancer)) {
+                    idx ++;
+                    item.options[idx] = new Option(alltargets[m],alltargets[m],false,false);
+                    
                 }
             }
         }
@@ -8433,34 +8654,34 @@ function showSpares(balancer,ishomedom)
     return;
 }
 
-function hideSpares() {
+function hideSpares(balnum) {
     var alltargets = new Array('$alltargets');
     var insttypes = new Array('$allinsttypes');
     var offloadtypes = new Array('primary','default');
 
-    document.getElementById('loadbalancing_targets').style.display='none';
-    document.getElementById('loadbalancing_disabled').style.display='block';
+    document.getElementById('loadbalancing_targets_'+balnum).style.display='none';
+    document.getElementById('loadbalancing_disabled_'+balnum).style.display='block';
 
     var total = alltargets.length - 1;
     for (var i=0; i<offloadtypes; i++) {
         for (var j=0; j<total; j++) {
-           document.getElementById('loadbalancing_target_'+offloadtypes[i]+'_'+j).checked = false;
-           document.getElementById('loadbalancing_target_'+offloadtypes[i]+'_'+j).value = '';
-           document.getElementById('loadbalancing_targettxt_'+offloadtypes[i]+'_'+j).innerHTML = '';
+           document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+j).checked = false;
+           document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+j).value = '';
+           document.getElementById('loadbalancing_targettxt_'+balnum+'_'+offloadtypes[i]+'_'+j).innerHTML = '';
         }
     }
     for (var k=0; k<insttypes.length; k++) {
-        document.getElementById('balanceruletitle_'+insttypes[k]).style.display='none';
-        document.getElementById('balancerule_'+insttypes[k]).style.display='none';
+        document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none';
+        document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none';
         if (insttypes[k] != '_LC_external') {
-            document.getElementById('loadbalancing_singleserver_'+insttypes[k]).length = 0;
-            document.getElementById('loadbalancing_singleserver_'+insttypes[k]).options[0] = new Option("","",true,true);
+            document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]).length = 0;
+            document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]).options[0] = new Option("","",true,true);
         }
     }
     return;
 }
 
-function checkOffloads(item,type) {
+function checkOffloads(item,balnum,type) {
     var alltargets = new Array('$alltargets');
     var offloadtypes = new Array('primary','default');
     if (item.checked) {
@@ -8472,10 +8693,10 @@ function checkOffloads(item,type) {
             other = offloadtypes[0];
         }
         for (var i=0; i<total; i++) {
-            var server = document.getElementById('loadbalancing_target_'+other+'_'+i).value;
+            var server = document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).value;
             if (server == item.value) {
-                if (document.getElementById('loadbalancing_target_'+other+'_'+i).checked) {
-                    document.getElementById('loadbalancing_target_'+other+'_'+i).checked = false;
+                if (document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).checked) {
+                    document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).checked = false;
                 }
             }
         }
@@ -8483,31 +8704,129 @@ function checkOffloads(item,type) {
     return;
 }
 
-function singleServerToggle(type) {
-    var offloadtoSelIdx = document.getElementById('loadbalancing_singleserver_'+type).selectedIndex;
+function singleServerToggle(balnum,type) {
+    var offloadtoSelIdx = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).selectedIndex;
     if (offloadtoSelIdx == 0) {
-        document.getElementById('loadbalancing_rules_'+type+'_0').checked = true;
-        document.getElementById('loadbalancing_singleserver_'+type).options[0].text = '';
+        document.getElementById('loadbalancing_rules_'+balnum+'_'+type+'_0').checked = true;
+        document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = '';
 
     } else {
-        document.getElementById('loadbalancing_rules_'+type+'_2').checked = true;
-        document.getElementById('loadbalancing_singleserver_'+type).options[0].text = '$select';
+        document.getElementById('loadbalancing_rules_'+balnum+'_'+type+'_2').checked = true;
+        document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = '$select';
     }
     return;
 }
 
-function balanceruleChange(formname,type) {
+function balanceruleChange(formname,balnum,type) {
     if (type == '_LC_external') {
-        return; 
+        return;
     }
-    var typesRules = getIndicesByName(formname,'loadbalancing_rules_'+type);
+    var typesRules = getIndicesByName(formname,'loadbalancing_rules_'+balnum+'_'+type);
     for (var i=0; i<typesRules.length; i++) {
         if (formname.elements[typesRules[i]].checked) {
             if (formname.elements[typesRules[i]].value != 'specific') {
-                document.getElementById('loadbalancing_singleserver_'+type).selectedIndex = 0;
-                document.getElementById('loadbalancing_singleserver_'+type).options[0].text = '';
+                document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).selectedIndex = 0;
+                document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = '';
             } else {
-                document.getElementById('loadbalancing_singleserver_'+type).options[0].text = '$select';
+                document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = '$select';
+            }
+        }
+    }
+    return;
+}
+
+function balancerDeleteChange(balnum) {
+    var hostitem = document.getElementById('loadbalancing_lonhost_'+balnum);
+    var baltotal = document.getElementById('loadbalancing_total').value;
+    var addtarget;
+    var removetarget;
+    var action = 'delete';
+    if (document.getElementById('loadbalancing_delete_'+balnum)) {
+        var lonhost = hostitem.value;
+        var currIdx = currBalancers.indexOf(lonhost);
+        if (document.getElementById('loadbalancing_delete_'+balnum).checked) {
+            if (currIdx != -1) {
+                currBalancers.splice(currIdx,1);
+            }
+            addtarget = lonhost;
+        } else {
+            if (currIdx == -1) {
+                currBalancers.push(lonhost);
+            }
+            removetarget = lonhost;
+            action = 'undelete';
+        }
+        balancerChange(balnum,baltotal,action,addtarget,removetarget);
+    }
+    return;
+}
+
+function balancerChange(balnum,baltotal,action,addtarget,removetarget) {
+    if (baltotal > 1) {
+        var offloadtypes = new Array('primary','default');
+        var alltargets = new Array('$alltargets');
+        var insttypes = new Array('$allinsttypes');
+        for (var i=0; i<baltotal; i++) {
+            if (i != balnum) {
+                for (var j=0; j<offloadtypes.length; j++) {
+                    var total = alltargets.length - 1;
+                    for (var k=0; k<total; k++) {
+                        var serveritem = document.getElementById('loadbalancing_target_'+i+'_'+offloadtypes[j]+'_'+k);
+                        var server = serveritem.value;
+                        if ((action == 'delete') || (action == 'change' && addtarget != ''))  {
+                            if (server == addtarget) {
+                                serveritem.disabled = '';
+                            }
+                        }
+                        if ((action == 'undelete') || (action == 'change' && removetarget != '')) {
+                            if (server == removetarget) {
+                                serveritem.disabled = 'disabled';
+                                serveritem.checked = false;
+                            }
+                        }
+                    }
+                }
+                for (var j=0; j<insttypes.length; j++) {
+                    if (insttypes[j] != '_LC_external') {
+                        if (document.getElementById('loadbalancing_singleserver_'+i+'_'+insttypes[j])) {
+                            var singleserver = document.getElementById('loadbalancing_singleserver_'+i+'_'+insttypes[j]);
+                            var currSel = singleserver.selectedIndex;
+                            var currVal = singleserver.options[currSel].value;
+                            if ((action == 'delete') || (action == 'change' && addtarget != '')) {
+                                var numoptions = singleserver.options.length;
+                                var needsnew = 1;
+                                for (var k=0; k<numoptions; k++) {
+                                    if (singleserver.options[k] == addtarget) {
+                                        needsnew = 0;
+                                        break;
+                                    }
+                                }
+                                if (needsnew == 1) {
+                                    singleserver.options[numoptions] = new Option(addtarget,addtarget,false,false);
+                                }
+                            }
+                            if ((action == 'undelete') || (action == 'change' && removetarget != '')) {
+                                singleserver.options.length = 0;
+                                if ((currVal) && (currVal != removetarget)) {
+                                    singleserver.options[0] = new Option("","",false,false);
+                                } else {
+                                    singleserver.options[0] = new Option("","",true,true);
+                                }
+                                var idx = 0;
+                                for (var m=0; m<alltargets.length; m++) {
+                                    if (currBalancers.indexOf(alltargets[m]) == -1) {
+                                        idx ++;
+                                        if (currVal == alltargets[m]) {
+                                            singleserver.options[idx] = new Option(alltargets[m],alltargets[m],true,true);
+                                        } else {
+                                            singleserver.options[idx] = new Option(alltargets[m],alltargets[m],false,false);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
     }