--- loncom/interface/domainprefs.pm	2012/12/20 13:53:22	1.160.6.11
+++ loncom/interface/domainprefs.pm	2012/10/02 19:21:20	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.11 2012/12/20 13:53:22 raeburn Exp $
+# $Id: domainprefs.pm,v 1.173 2012/10/02 19:21:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,7 @@ $dom,$settings,$rowtotal,$action.
 
 $dom is the domain, $settings is a reference to a hash of current settings for
 the current context, $rowtotal is a reference to the scalar used to record the 
-number of rows displayed on the page, and $action is the context (quotas,
+number of rows displayed on the page, and $action is the context (quotas,  
 requestcourses or requestauthor).
 
 The print_quotas routine was orginally created to display/store information
@@ -210,13 +210,15 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','usersessions',
-                'loadbalancing','requestauthor'],$dom);
+                'serverstatuses','requestcourses','helpsettings',
+                'coursedefaults','usersessions','loadbalancing',
+                'requestauthor'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
                        'requestcourses','requestauthor','coursecategories',
-                       'serverstatuses','usersessions');
+                       'serverstatuses','helpsettings',
+                       'coursedefaults','usersessions');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -353,6 +355,26 @@ sub handler {
                               col3 => 'Specific IPs',
                             }],
                  },
+        'helpsettings' =>
+                 {text   => 'Help page settings',
+                  help   => 'Domain_Configuration_Help_Settings',
+                  header => [{col1 => 'Help Settings (logged-in users)',
+                              col2 => 'Value'}],
+                 },
+        'coursedefaults' => 
+                 {text => 'Course/Community defaults',
+                  help => 'Domain_Configuration_Course_Defaults',
+                  header => [{col1 => 'Defaults which can be overridden in each course by a CC',
+                              col2 => 'Value',},
+                             {col1 => 'Defaults which can be overridden for each course by a DC',
+                              col2 => 'Value',},],
+                 },
+        'privacy' => 
+                 {text   => 'User Privacy',
+                  help   => 'Domain_Configuration_User_Privacy',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
+                 },
         'usersessions' =>
                  {text  => 'User session hosting/offloading',
                   help  => 'Domain_Configuration_User_Sessions',
@@ -364,7 +386,7 @@ sub handler {
                               col2 => 'Rules'}],
                  },
          'loadbalancing' =>
-                 {text  => 'Dedicated Load Balancer(s)',
+                 {text  => 'Dedicated Load Balancer',
                   help  => 'Domain_Configuration_Load_Balancing',
                   header => [{col1 => 'Balancers',
                               col2 => 'Default destinations',
@@ -405,34 +427,6 @@ sub handler {
         }
         &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();
@@ -511,6 +505,10 @@ sub process_changes {
         $output = &modify_quotas($dom,$action,%domconfig);
     } elsif ($action eq 'requestauthor') {
         $output = &modify_quotas($dom,$action,%domconfig);
+    } elsif ($action eq 'helpsettings') {
+        $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
+    } elsif ($action eq 'coursedefaults') {
+        $output = &modify_coursedefaults($dom,%domconfig);
     } elsif ($action eq 'usersessions') {
         $output = &modify_usersessions($dom,%domconfig);
     } elsif ($action eq 'loadbalancing') {
@@ -541,7 +539,7 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'coursecategories') ||
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || 
             (($action eq 'login') && ($numheaders < 3))) {
             $colspan = ' colspan="2"';
         }
@@ -580,6 +578,8 @@ sub print_config_box {
             $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('top',$dom,$settings,\$rowtotal);
         }
         $output .= '
            </table>
@@ -1191,12 +1191,13 @@ sub display_color_options {
     } else {
         $datatable .= '<td>&nbsp;</td>';
     }
-    my $current_color = $designs->{'font'} ? $designs->{'font'} : $defaults->{'font'};
-
+    my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'});
     $datatable .= '<td><span class="LC_nobreak">'.
-                  '<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
-                  ' value="'.$current_color.'" />&nbsp;'.
-                  '&nbsp;</td></tr>';
+                  '<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>';
     unless ($role eq 'login') { 
         $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{'fontmenu'}.'</td>';
@@ -1205,13 +1206,13 @@ sub display_color_options {
         } else {
             $datatable .= '<td>&nbsp;</td>';
         }
-        $current_color = $designs->{'fontmenu'} ?
-            $designs->{'fontmenu'} : $defaults->{'fontmenu'};
+        $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'});
         $datatable .= '<td><span class="LC_nobreak">'.
-                      '<input class="colorchooser" type="text" size="10" name="'
-                      .$role.'_fontmenu"'.
-                      ' value="'.$current_color.'" />&nbsp;'.
-                      '&nbsp;</td></tr>';
+                      '<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>';
     }
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
@@ -1339,12 +1340,12 @@ sub display_color_options {
     $datatable .= '<td class="LC_right_item">'.
                   '<table border="0"><tr>';
     foreach my $item (@{$bgs}) {
-        $datatable .= '<td align="center">';
-        my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
+        my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item});
+        $datatable .= '<td align="center">'.$link;
         if ($designs->{'bgs'}{$item}) {
-            $datatable .= '&nbsp;';
+            $datatable .= '&nbsp;<span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span>';
         }
-        $datatable .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
+        $datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'bgs'}{$item}.
                       '" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
     }
     $datatable .= '</tr></table></td></tr>';
@@ -1366,15 +1367,14 @@ sub display_color_options {
     $datatable .= '<td class="LC_right_item">'.
                   '<table border="0"><tr>';
     foreach my $item (@{$links}) {
-        my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
-        $datatable .= '<td align="center">'."\n";
-
+        $datatable .= '<td align="center">'."\n".
+                      &color_pick($phase,$role,$item,$choices->{$item},
+                                  $designs->{'links'}{$item});
         if ($designs->{'links'}{$item}) {
-            $datatable.='&nbsp;';
+            $datatable.='&nbsp;<span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'links'}{$item}.';">&nbsp;&nbsp;&nbsp;</span>';
         }
-        $datatable .= '<br /><input type="text" size="8" class="colorchooser" name="'.$role.'_'.$item.'" value="'.$color.
+        $datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'links'}{$item}.
                       '" /></td>';
-
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -1503,7 +1503,7 @@ sub print_quotas {
     } elsif ($context eq 'requestauthor') {
         @usertools = ('author');
         @options = ('norequest','approval','automatic');
-        %titles = &authorrequest_titles();
+        %titles = &authorrequest_titles(); 
     } else {
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
@@ -2923,7 +2923,7 @@ sub print_loadbalancing {
                       '<td rowspan="'.$rownum.'" valign="top">'.
                       '<p>';
         if ($lonhost eq '') {
-            $datatable .= '<span class="LC_nobreak">';
+            $datatable .= '<span class="LC_nobreak">'; 
             if (keys(%currbalancer) > 0) {
                 $datatable .= &mt('Add balancer:');
             } else {
@@ -2939,7 +2939,7 @@ sub print_loadbalancing {
                 next if ($currbalancer{$server});
                 $datatable .= '<option value="'.$server.'">'.$server.'</option>'."\n";
             }
-            $datatable .=
+            $datatable .= 
                 '</select>'."\n".
                 '<input type="hidden" name="loadbalancing_prevlonhost_'.$balnum.'" id="loadbalancing_prevlonhost_'.$balnum.'" value="" />&nbsp;</span>'."\n";
         } else {
@@ -2978,7 +2978,7 @@ sub print_loadbalancing {
                 if (exists($currbalancer{$spares[$i]})) {
                     $disabled = ' disabled="disabled"';
                 }
-                $targettable .=
+                $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>';
@@ -3005,7 +3005,7 @@ sub print_loadbalancing {
                                '<table><tr>'.$targettable.'</tr></table><br />';
             }
         }
-        my $cssidx = $balnum%2;
+        my $cssidx = $balnum%2; 
         $datatable .= '</div></td></tr>'.
                       &loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
                                            $othertitle,$usertypes,$types,\%servers,
@@ -3063,7 +3063,7 @@ sub loadbalancing_rules {
         $css_class,$balnum,$islast) = @_;
     my $output;
     my $num = 0;
-    my ($alltypes,$othertypes,$titles) =
+    my ($alltypes,$othertypes,$titles) = 
         &loadbalancing_titles($dom,$intdom,$usertypes,$types);
     if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH'))  {
         foreach my $type (@{$alltypes}) {
@@ -3135,7 +3135,7 @@ sub loadbalance_rule_row {
     if ($islast && $num == 1) {
         $space = '<div display="inline-block">&nbsp;</div>';
     }
-    my $output =
+    my $output = 
         '<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td valign="top">'.$space.
         '<div id="balanceruletitle_'.$balnum.'_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n".
         '<td valaign="top">'.$space.
@@ -3155,7 +3155,7 @@ sub loadbalance_rule_row {
                 unless ($checked) {
                     $default = ' selected="selected"';
                 }
-                $extra =
+                $extra = 
                     ':&nbsp;<select name="loadbalancing_singleserver_'.$balnum.'_'.$type.
                     '" id="loadbalancing_singleserver_'.$balnum.'_'.$type.
                     '" onchange="singleServerToggle('."'$balnum','$type'".')">'."\n".
@@ -3256,7 +3256,7 @@ sub authorrequest_titles {
                                    automatic  => 'Automatic approval',
                  );
     return %titles;
-}
+} 
 
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
@@ -3495,9 +3495,9 @@ sub captcha_choice {
 #
 # Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit:
 # https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple
-# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu)
+# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu) 
 # specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain.
-#
+#  
     $output .= '</td></tr>'."\n".
                '<tr><td>'."\n".
                '<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span>&nbsp;'."\n".
@@ -4805,7 +4805,7 @@ sub modify_login {
                     } else {
                         my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$newfile{$lang},$result);
                         $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
-                        if ((grep(/^\Q$lang\E$/,@currlangs)) &&
+                        if ((grep(/^\Q$lang\E$/,@currlangs)) && 
                             (!grep(/^\Q$lang\E$/,@delurls))) {
 
                             $loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang};
@@ -4921,7 +4921,7 @@ sub modify_login {
                     }
                 } elsif ($item eq 'captcha') {
                     if (ref($loginhash{'login'}) eq 'HASH') {
-                        my $chgtxt;
+                        my $chgtxt; 
                         if ($loginhash{'login'}{$item} eq 'notused') {
                             $chgtxt .= &mt('No CAPTCHA validation in use for helpdesk form.');
                         } else {
@@ -5399,7 +5399,7 @@ sub publishlogo {
 # See if there is anything left
     unless ($fname) { return ('error: no uploaded file'); }
     $fname="$subdir/$fname";
-    my $docroot=$r->dir_config('lonDocRoot');
+    my $docroot=$r->dir_config('lonDocRoot'); 
     my $filepath="$docroot/priv";
     my $relpath = "$dom/$confname";
     my ($fnamepath,$file,$fetchthumb);
@@ -5407,7 +5407,7 @@ sub publishlogo {
     if ($fname=~m|/|) {
         ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
     }
-    my @parts=split(/\//,"$filepath/$relpath/$fnamepath");  
+    my @parts=split(/\//,"$filepath/$relpath/$fnamepath");
     my $count;
     for ($count=5;$count<=$#parts;$count++) {
         $filepath.="/$parts[$count]";
@@ -5662,7 +5662,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.'&amp;role=dc./'.$dom.'/&amp;destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>';
+	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
     }
     return $switchserver;
 }
@@ -5673,7 +5673,7 @@ sub modify_quotas {
         %limithash,$toolregexp,%conditions,$resulttext,%changes);
     if ($action eq 'quotas') {
         $context = 'tools'; 
-    } else { 
+    } else {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
@@ -5863,7 +5863,7 @@ sub modify_quotas {
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
 
             $resulttext = &mt('Changes made:').'<ul>';
-            unless (($context eq 'requestcourses') ||
+            unless (($context eq 'requestcourses') || 
                     ($context eq 'requestauthor')) {
                 if (ref($changes{'defaultquota'}) eq 'HASH') {
                     $resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
@@ -5884,7 +5884,7 @@ sub modify_quotas {
                 my (%haschgs,%inconf);
                 if ($context eq 'requestauthor') {
                     %haschgs = %changes;
-                    %inconf = %confhash;
+                    %inconf = %confhash; 
                 } else {
                     if (ref($changes{$item}) eq 'HASH') {
                         %haschgs = %{$changes{$item}};
@@ -5898,7 +5898,7 @@ sub modify_quotas {
                         &Apache::lonnet::usertools_access($env{'user.name'},
                                                           $env{'user.domain'},
                                                           $item,'reload',$context);
-                    if (($context eq 'requestcourses') ||
+                    if (($context eq 'requestcourses') || 
                         ($context eq 'requestauthor')) {
                         if ($env{'environment.canrequest.'.$item} ne $newacc) {
                             $newenv{'environment.canrequest.'.$item} = $newacc;
@@ -6923,7 +6923,7 @@ sub modify_usercreation {
                             if ($captchas{$cancreate{$type}}) {
                                 $chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}.");
                             } else {
-                                $chgtext .= &mt('Validation for self-creation screen set to unknown type.');
+                                $chgtext .= &mt('Validation for self-creation screen set to unknown type.'); 
                             }
                         }
                     } elsif ($type eq 'recaptchakeys') {
@@ -7051,7 +7051,7 @@ sub process_captcha {
         $newsettings->{'captcha'} = 'original';
     }
     if ($current->{'captcha'} ne $newsettings->{'captcha'}) {
-        if ($container eq 'cancreate') {
+        if ($container eq 'cancreate') { 
             if (ref($changes->{'cancreate'}) eq 'ARRAY') {
                 push(@{$changes->{'cancreate'}},'captcha');
             } elsif (!defined($changes->{'cancreate'})) {
@@ -7075,12 +7075,10 @@ sub process_captcha {
     if (ref($current->{'recaptchakeys'}) eq 'HASH') {
         $currpub = $current->{'recaptchakeys'}{'public'};
         $currpriv = $current->{'recaptchakeys'}{'private'};
-        unless ($newsettings->{'captcha'} eq 'recaptcha') {
-            $newsettings->{'recaptchakeys'} = {
-                                                 public  => '',
-                                                 private => '',
-                                              }
-        }
+        $newsettings->{'recaptchakeys'} = {
+                                             public  => '',
+                                             private => '',
+                                          }
     }
     if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
         if ($container eq 'cancreate') {
@@ -7090,7 +7088,7 @@ sub process_captcha {
                 $changes->{'cancreate'} = ['recaptchakeys'];
             }
         } else {
-            $changes->{'recaptchakeys'} = 1;
+            $changes->{'recaptchakeys'} = 1; 
         }
     }
     return;
@@ -7774,8 +7772,8 @@ sub modify_helpsettings {
                 } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
                     $changes{$item} = 1;
                 }
-	    }
-            if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
+            }
+            if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { 
                 $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
             }
         }
@@ -8182,7 +8180,7 @@ sub modify_loadbalancing {
         if ($balancer eq '') {
             next;
         }
-        if (!exists($servers{$balancer})) {
+        if (!exists($servers{$balancer})) { 
             if (exists($currbalancer{$balancer})) {
                 push(@{$changes{'delete'}},$balancer);
             }
@@ -8233,14 +8231,14 @@ sub modify_loadbalancing {
             }
         } else {
             if (ref($defaultshash{'loadbalancing'}{$balancer}) eq 'HASH') {
-                foreach my $sparetype (@sparestypes) {
+                foreach my $sparetype (@sparestypes) { 
                     if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {
                         if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) {
                             $changes{'curr'}{$balancer}{'targets'} = 1;
                         }
                     }
                 }
-            }
+            }  
         }
         my $ishomedom;
         if (&Apache::lonnet::host_domain($balancer) eq $dom) {
@@ -8249,7 +8247,7 @@ sub modify_loadbalancing {
         if (ref($alltypes) eq 'ARRAY') {
             foreach my $type (@{$alltypes}) {
                 my $rule;
-                unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) &&
+                unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) && 
                          (!$ishomedom)) {
                     $rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type};
                 }
@@ -8274,7 +8272,7 @@ sub modify_loadbalancing {
         }
         my $putresult = &Apache::lonnet::put_dom('configuration',
                                                  \%defaultshash,$dom);
-
+ 
         if ($putresult eq 'ok') {
             if (keys(%changes) > 0) {
                 if (ref($changes{'delete'}) eq 'ARRAY') {
@@ -8284,7 +8282,7 @@ sub modify_loadbalancing {
                     }
                 }
                 if (ref($changes{'add'}) eq 'ARRAY') {
-                    foreach my $balancer (sort(@{$changes{'add'}})) {
+                    foreach my $balancer (sort(@{$changes{'add'}})) {   
                         $resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer);
                     }
                 }
@@ -8330,7 +8328,7 @@ sub modify_loadbalancing {
                                         } else {
                                             $balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type});
                                         }
-                                        $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>'; 
+                                        $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>';     
                                     }
                                 }
                             }
@@ -8390,7 +8388,7 @@ sub recurse_cat_deletes {
                 delete($coursecategories->{$subitem});
                 $deletions->{$subitem} = 1;
                 &recurse_cat_deletes($subitem,$coursecategories,$deletions);
-            }  
+            }
         }
     }
     return;
@@ -8535,7 +8533,7 @@ sub lonbalance_targets_js {
     }
     &get_loadbalancers_config($servers,\%existing,\%currbalancer,
                               \%currtargets,\%currrules);
-    my $balancers = join("','",sort(keys(%currbalancer)));
+    my $balancers = join("','",sort(keys(%currbalancer))); 
     return <<"END";
 
 <script type="text/javascript">
@@ -8618,12 +8616,12 @@ function showSpares(balancer,ishomedom,b
             var item = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]);
             item.options.length = 0;
             item.options[0] = new Option("","",true,true);
-            var idx = 0;
+            var idx = 0;  
             for (var m=0; m<alltargets.length; m++) {
                 if ((currBalancers.indexOf(alltargets[m]) == -1) && (alltargets[m] != balancer)) {
                     idx ++;
                     item.options[idx] = new Option(alltargets[m],alltargets[m],false,false);
-
+                    
                 }
             }
         }
@@ -8696,7 +8694,7 @@ function singleServerToggle(balnum,type)
 
 function balanceruleChange(formname,balnum,type) {
     if (type == '_LC_external') {
-        return; 
+        return;
     }
     var typesRules = getIndicesByName(formname,'loadbalancing_rules_'+balnum+'_'+type);
     for (var i=0; i<typesRules.length; i++) {