--- loncom/interface/domainprefs.pm	2013/08/13 19:18:43	1.160.6.23
+++ loncom/interface/domainprefs.pm	2013/01/09 21:30:27	1.186
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.23 2013/08/13 19:18:43 raeburn Exp $
+# $Id: domainprefs.pm,v 1.186 2013/01/09 21:30:27 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
@@ -94,9 +94,7 @@ about default quota sizes for portfolio
 institutional affiliation in the domain (e.g., Faculty, Staff, Student etc.), 
 but is now also used to manage availability of user tools: 
 i.e., blogs, aboutme page, and portfolios, and the course request tool,
-used by course owners to request creation of a course, and to display/store
-default quota sizes for authoring spaces.
-
+used by course owners to request creation of a course.
 
 Outputs: 1
 
@@ -212,13 +210,15 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','coursedefaults',
-                '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','coursedefaults','usersessions');
+                       'serverstatuses','helpsettings',
+                       'coursedefaults','usersessions');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -254,11 +254,11 @@ sub handler {
                                   col2 => 'Value'}],
                     },
         'quotas' => 
-                    { text => 'Blogs, personal web pages, webDAV/quotas, portfolios',
+                    { text => 'Blogs, personal web pages, webDAV, portfolios',
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
-                                  col3 => 'Quotas, Mb; (Authoring requires role)',}],
+                                  col3 => 'Portfolio quota',}],
                     },
         'autoenroll' =>
                    { text => 'Auto-enrollment settings',
@@ -355,12 +355,26 @@ sub handler {
                               col3 => 'Specific IPs',
                             }],
                  },
-        'coursedefaults' =>
+        '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 for each course by a DC',
+                  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',
@@ -393,6 +407,8 @@ sub handler {
                            };
     }
 
+
+
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -403,8 +419,7 @@ sub handler {
     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().
-                 &credits_js(); 
+        my $js = &recaptcha_js();
         if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
             my ($othertitle,$usertypes,$types) =
                 &Apache::loncommon::sorted_inst_types($dom);
@@ -418,12 +433,12 @@ sub handler {
     } else {
 # check if domconfig user exists for the domain.
         my $servadm = $r->dir_config('lonAdmEMail');
-        my ($configuserok,$author_ok,$switchserver) = 
+        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).
+                           $confname).
                       '<br />'
             );
             if ($switchserver) {
@@ -477,6 +492,7 @@ sub handler {
                 }
             }
         }
+
         &Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs);
     }
     return OK;
@@ -511,7 +527,7 @@ sub process_changes {
     } elsif ($action eq 'contacts') {
         $output = &modify_contacts($dom,%domconfig);
     } elsif ($action eq 'defaults') {
-        $output = &modify_defaults($dom,$r,%domconfig);
+        $output = &modify_defaults($dom,$r);
     } elsif ($action eq 'scantron') {
         $output = &modify_scantron($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursecategories') {
@@ -522,6 +538,8 @@ 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') {
@@ -536,6 +554,7 @@ sub print_config_box {
     my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_;
     my $rowtotal = 0;
     my $output;
+
     if ($action eq 'coursecategories') {
         $output = &coursecategories_javascript($settings);
     }
@@ -554,7 +573,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"';
         }
@@ -593,6 +612,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>
@@ -682,6 +703,8 @@ sub print_config_box {
               <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
                        &print_usersessions('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -778,8 +801,6 @@ sub print_config_box {
             $output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'loadbalancing') {
             $output .= &print_loadbalancing($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'coursedefaults') {
-            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -865,11 +886,10 @@ sub print_login {
     } elsif ($caller eq 'page') {
         my %defaultchecked = ( 
                                'coursecatalog' => 'on',
-                               'helpdesk'      => 'on',
                                'adminmail'     => 'off',
                                'newuser'       => 'off',
                              );
-        my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
+        my @toggles = ('coursecatalog','adminmail','newuser');
         my (%checkedon,%checkedoff);
         foreach my $item (@toggles) {
             if ($defaultchecked{$item} eq 'on') { 
@@ -1085,7 +1105,6 @@ 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:",
@@ -1123,7 +1142,17 @@ sub print_rolecolors {
     my %designhash = &Apache::loncommon::get_domainconf($dom);
     my %defaultdesign = %Apache::loncommon::defaultdesign;
     my (%is_custom,%designs);
-    my %defaults = &role_defaults($role,\@bgs,\@links,\@images);
+    my %defaults = (
+                   img => $defaultdesign{$role.'.img'},
+                   font => $defaultdesign{$role.'.font'},
+		   fontmenu => $defaultdesign{$role.'.fontmenu'},
+                   );
+    foreach my $item (@bgs) {
+        $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
+    }
+    foreach my $item (@links) {
+        $defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item};
+    }
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{$role}) eq 'HASH') {
             if ($settings->{$role}->{'img'} ne '') {
@@ -1184,44 +1213,6 @@ sub print_rolecolors {
     return $datatable;
 }
 
-sub role_defaults {
-    my ($role,$bgs,$links,$images,$logintext) = @_;
-    my %defaults;
-    unless ((ref($bgs) eq 'ARRAY') && (ref($links) eq 'ARRAY') && (ref($images) eq 'ARRAY')) {
-        return %defaults;
-    }
-    my %defaultdesign = %Apache::loncommon::defaultdesign;
-    if ($role eq 'login') {
-        %defaults = (
-                       font => $defaultdesign{$role.'.font'},
-                    );
-        if (ref($logintext) eq 'ARRAY') {
-            foreach my $item (@{$logintext}) {
-                $defaults{'logintext'}{$item} = $defaultdesign{$role.'.'.$item};
-            }
-        }
-        foreach my $item (@{$images}) {
-            $defaults{'showlogo'}{$item} = 1;
-        }
-    } else {
-        %defaults = (
-                       img => $defaultdesign{$role.'.img'},
-                       font => $defaultdesign{$role.'.font'},
-                       fontmenu => $defaultdesign{$role.'.fontmenu'},
-                    );
-    }
-    foreach my $item (@{$bgs}) {
-        $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
-    }
-    foreach my $item (@{$links}) {
-        $defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item};
-    }
-    foreach my $item (@{$images}) {
-        $defaults{$item} = $defaultdesign{$role.'.'.$item};
-    }
-    return %defaults;
-}
-
 sub display_color_options {
     my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
         $images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_;
@@ -1238,7 +1229,7 @@ sub display_color_options {
 
     $datatable .= '<td><span class="LC_nobreak">'.
                   '<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
-                  ' value="'.$current_color.'" />&nbsp;'.
+                  ' value="'.$current_color.'" />&nbsp;'. 
                   '&nbsp;</td></tr>';
     unless ($role eq 'login') { 
         $datatable .= '<tr'.$css_class.'>'.
@@ -1248,7 +1239,7 @@ sub display_color_options {
         } else {
             $datatable .= '<td>&nbsp;</td>';
         }
-	$current_color = $designs->{'fontmenu'} ?
+	$current_color = $designs->{'fontmenu'} ? 
 	    $designs->{'fontmenu'} : $defaults->{'fontmenu'};
         $datatable .= '<td><span class="LC_nobreak">'.
                       '<input class="colorchooser" type="text" size="10" name="'
@@ -1269,7 +1260,7 @@ sub display_color_options {
                     &login_header_options($img,$role,$defaults,$is_custom,$choices);
                 $logincolors =
                     &login_text_colors($img,$role,$logintext,$phase,$choices,
-                                       $designs,$defaults);
+                                            $designs);
             } elsif ($img ne 'domlogo') {
                 $datatable.= &logo_display_options($img,$defaults,$designs);
             }
@@ -1348,12 +1339,12 @@ sub display_color_options {
                 $datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import,
                                              $showfile,$fullsize,$role,$img,$imgfile,$logincolors);
             } else {
-                $datatable .= '<td>&nbsp;</td><td class="LC_left_item">'.
-                              &mt('Upload:').'<br />';
+                $datatable .= '<td colspan="2" class="LC_right_item"><br />'.
+                              &mt('Upload:');
             }
         } else {
-            $datatable .= '<td>&nbsp;</td><td class="LC_left_item">'.
-                          &mt('Upload:').'<br />';
+            $datatable .= '<td colspan="2" class="LC_right_item"><br />'.
+                          &mt('Upload:');
         }
         if ($switchserver) {
             $datatable .= &mt('Upload to library server: [_1]',$switchserver);
@@ -1383,7 +1374,7 @@ sub display_color_options {
                   '<table border="0"><tr>';
 
     foreach my $item (@{$bgs}) {
-        $datatable .= '<td align="center">'.$choices->{$item};
+        $datatable .= '<td align="center">';
 	my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
         if ($designs->{'bgs'}{$item}) {
             $datatable .= '&nbsp;';
@@ -1411,7 +1402,8 @@ sub display_color_options {
                   '<table border="0"><tr>';
     foreach my $item (@{$links}) {
 	my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
-        $datatable .= '<td align="center">'.$choices->{$item}."\n";
+        $datatable .= '<td align="center">'."\n";
+
         if ($designs->{'links'}{$item}) {
             $datatable.='&nbsp;';
         }
@@ -1469,13 +1461,17 @@ sub login_header_options  {
 }
 
 sub login_text_colors {
-    my ($img,$role,$logintext,$phase,$choices,$designs,$defaults) = @_;
+    my ($img,$role,$logintext,$phase,$choices,$designs) = @_;
     my $color_menu = '<table border="0"><tr>';
     foreach my $item (@{$logintext}) {
-        $color_menu .= '<td align="center">'.$choices->{$item};
-        my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item};
-        $color_menu .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
-                      '" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
+        my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'logintext'}{$item});
+        $color_menu .= '<td align="center">'.$link;
+        if ($designs->{'logintext'}{$item}) {
+            $color_menu .= '&nbsp;<span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'logintext'}{$item}.';">&nbsp;&nbsp;&nbsp;</span>';
+        }
+        $color_menu .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.
+                       $designs->{'logintext'}{$item}.'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'.
+                       '<td>&nbsp;</td>';
     }
     $color_menu .= '</tr></table><br />';
     return $color_menu;
@@ -1507,12 +1503,20 @@ sub image_changes {
                        $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
                        '</label>&nbsp;'.&mt('Replace:').'</span><br />';
         } else {
-            $output .= '<td valign="middle">'.$logincolors.&mt('Upload:').'<br />';
+            $output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />';
         }
     }
     return $output;
 }
 
+sub color_pick {
+    my ($phase,$role,$item,$desc,$curcol) = @_;
+    my $link = '<a href="javascript:pjump('."'color_custom','".$desc.
+               "','".$curcol."','".$role.'_'.$item."','parmform.pres','psub'".
+               ');">'.$desc.'</a>';
+    return $link;
+}
+
 sub print_quotas {
     my ($dom,$settings,$rowtotal,$action) = @_;
     my $context;
@@ -1521,7 +1525,7 @@ sub print_quotas {
     } else {
         $context = $action;
     }
-    my ($datatable,$defaultquota,$authorquota,@usertools,@options,%validations);
+    my ($datatable,$defaultquota,@usertools,@options,%validations);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     my $typecount = 0;
     my ($css_class,%titles);
@@ -1533,25 +1537,22 @@ 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();
     }
     if (ref($types) eq 'ARRAY') {
         foreach my $type (@{$types}) {
-            my ($currdefquota,$currauthorquota);
+            my $currdefquota;
             unless (($context eq 'requestcourses') ||
                     ($context eq 'requestauthor')) {
                 if (ref($settings) eq 'HASH') {
                     if (ref($settings->{defaultquota}) eq 'HASH') {
-                        $currdefquota = $settings->{defaultquota}->{$type};
+                        $currdefquota = $settings->{defaultquota}->{$type}; 
                     } else {
                         $currdefquota = $settings->{$type};
                     }
-                    if (ref($settings->{authorquota}) eq 'HASH') {
-                        $currauthorquota = $settings->{authorquota}->{$type};
-                    }
                 }
             }
             if (defined($usertypes->{$type})) {
@@ -1665,15 +1666,10 @@ sub print_quotas {
                 unless (($context eq 'requestcourses') ||
                         ($context eq 'requestauthor')) {
                     $datatable .= 
-                              '<td class="LC_right_item">'.
-                              '<span class="LC_nobreak">'.&mt('Portfolio').':&nbsp;'.
+                              '<td class="LC_right_item"><span class="LC_nobreak">'.
                               '<input type="text" name="quota_'.$type.
                               '" value="'.$currdefquota.
-                              '" size="5" /></span>'.('&nbsp;' x 2).
-                              '<span class="LC_nobreak">'.&mt('Authoring').':&nbsp;'.
-                              '<input type="text" name="authorquota_'.$type.
-                              '" value="'.$currauthorquota.
-                              '" size="5" /></span></td>';
+                              '" size="5" /> Mb</span></td>';
                 }
                 $datatable .= '</tr>';
             }
@@ -1681,16 +1677,12 @@ sub print_quotas {
     }
     unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
         $defaultquota = '20';
-        $authorquota = '500';
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{'defaultquota'}) eq 'HASH') {
                 $defaultquota = $settings->{'defaultquota'}->{'default'};
             } elsif (defined($settings->{'default'})) {
                 $defaultquota = $settings->{'default'};
             }
-            if (ref($settings->{'authorquota'}) eq 'HASH') {
-                $authorquota = $settings->{'authorquota'}->{'default'};
-            }
         }
     }
     $typecount ++;
@@ -1801,19 +1793,15 @@ sub print_quotas {
     }
     $datatable .= '</td>';
     unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
-        $datatable .= '<td class="LC_right_item">'.
-                      '<span class="LC_nobreak">'.&mt('Portfolio').':&nbsp;'.
+        $datatable .= '<td class="LC_right_item"><span class="LC_nobreak">'.
                       '<input type="text" name="defaultquota" value="'.
-                      $defaultquota.'" size="5" /></span>'.('&nbsp;' x2).
-                      '<span class="LC_nobreak">'.&mt('Authoring').':&nbsp;'.
-                      '<input type="text" name="authorquota" value="'.
-                      $authorquota.'" size="5" /></span></td>';
+                      $defaultquota.'" size="5" /> Mb</span></td>';
     }
     $datatable .= '</tr>';
     $typecount ++;
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
-                  '<td>'.&mt('LON-CAPA Advanced Users').'<br />';
+                  '<td>'.&mt('LON-CAPA Advanced Users').' ';
     if ($context eq 'requestcourses') {
         $datatable .= &mt('(overrides affiliation, if set)').
                       '</td>'.
@@ -1940,16 +1928,35 @@ sub print_quotas {
 
 sub print_requestmail {
     my ($dom,$action,$settings,$rowtotal) = @_;
-    my ($now,$datatable,%currapp,$rows);
+    my ($now,$datatable,%dompersonnel,@domcoord,@currapproval,$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 '') {
-               map {$currapp{$_}=1;} split(/,/,$settings->{'notify'}{'approval'});
+               @currapproval = split(',',$settings->{'notify'}{'approval'});
             }
         }
     }
-    my $numinrow = 2;
+    if (@currapproval) {
+        foreach my $dc (@currapproval) {
+            unless (grep(/^\Q$dc\E$/,@domcoord)) {
+                push(@domcoord,$dc);
+            }
+        }
+    }
+    @domcoord = sort(@domcoord);
+    my $numinrow = 4;
+    my $numdc = @domcoord;
     my $css_class = 'class="LC_odd_row"';
     my $text;
     if ($action eq 'requestcourses') {
@@ -1960,12 +1967,42 @@ sub print_requestmail {
     $datatable = '<tr '.$css_class.'>'.
                  ' <td>'.$text.'</td>'.
                  ' <td class="LC_left_item">';
-    my ($numdc,$table,$rows) = &active_dc_picker($dom,$numinrow,'checkbox',
-                                                 'reqapprovalnotify',%currapp);
-    if ($numdc > 0) {
-        $datatable .= $table;
+    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.' ('.$uname.':'.$udom.')</label></span></td>';
+        }
+        $datatable .= '</tr></table>';
     } else {
         $datatable .= &mt('There are no active Domain Coordinators');
+        $rows ++;
     }
     $datatable .='</td></tr>';
     $$rowtotal += $rows;
@@ -2120,7 +2157,8 @@ sub print_autoupdate {
 
 sub print_autocreate {
     my ($dom,$settings,$rowtotal) = @_;
-    my (%createon,%createoff,%currhash);
+    my (%createon,%createoff);
+    my $curr_dc;
     my @types = ('xml','req');
     if (ref($settings) eq 'HASH') {
         foreach my $item (@types) {
@@ -2133,9 +2171,7 @@ sub print_autocreate {
                 }
             }
         }
-        if ($settings->{'xmldc'} ne '') {
-            $currhash{$settings->{'xmldc'}} = 1;
-        }
+        $curr_dc = $settings->{'xmldc'};
     } else {
         foreach my $item (@types) {
             $createoff{$item} = ' checked="checked" ';
@@ -2143,7 +2179,6 @@ 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>'.
@@ -2158,16 +2193,15 @@ 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,$rows) = &active_dc_picker($dom,$numinrow,'radio',
-                                                   'autocreate_xmldc',%currhash);
+    my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc);
     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;
 }
 
@@ -2290,7 +2324,7 @@ sub print_contacts {
     my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails,%bccemails);
     my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
-                    'requestsmail','updatesmail','idconflictsmail');
+                    'requestsmail');
     foreach my $type (@mailings) {
         $otheremails{$type} = '';
     }
@@ -2326,22 +2360,21 @@ sub print_contacts {
         $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
         $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; 
         $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
     }
     my ($titles,$short_titles) = &contact_titles();
     my $rownum = 0;
     my $css_class;
     foreach my $item (@contacts) {
+        $rownum ++;
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'. 
                   '<td><span class="LC_nobreak">'.$titles->{$item}.
                   '</span></td><td class="LC_right_item">'.
                   '<input type="text" name="'.$item.'" value="'.
                   $to{$item}.'" /></td></tr>';
-        $rownum ++;
     }
     foreach my $type (@mailings) {
+        $rownum ++;
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td><span class="LC_nobreak">'.
@@ -2364,21 +2397,7 @@ sub print_contacts {
                           'value="'.$bccemails{$type}.'"  />';
         }
         $datatable .= '</td></tr>'."\n";
-        $rownum ++;
     }
-    my %choices;
-    $choices{'reporterrors'} = &mt('E-mail error reports to [_1]',
-                                   &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                   &mt('LON-CAPA core group - MSU'),600,500));
-    $choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]',
-                                    &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                    &mt('LON-CAPA core group - MSU'),600,500));
-    my @toggles = ('reporterrors','reportupdates');
-    my %defaultchecked = ('reporterrors'  => 'on',
-                          'reportupdates' => 'on');
-    (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                               \%choices,$rownum);
-    $datatable .= $reports;
     $$rowtotal += $rownum;
     return $datatable;
 }
@@ -2400,8 +2419,7 @@ sub print_helpsettings {
 }
 
 sub radiobutton_prefs {
-    my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick,
-        $additional) = @_;
+    my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_;
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
                    (ref($choices) eq 'HASH'));
 
@@ -2427,22 +2445,17 @@ sub radiobutton_prefs {
             }
         }
     }
-    if ($onclick) {
-        $onclick = ' onclick="'.$onclick.'"';
-    }
     foreach my $item (@{$toggles}) {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .=
-            '<tr'.$css_class.'><td valign="top">'.
-            '<span class="LC_nobreak">'.$choices->{$item}.
+            '<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices->{$item}.
             '</span></td>'.
             '<td class="LC_right_item"><span class="LC_nobreak">'.
             '<label><input type="radio" name="'.
-            $item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').
+            $item.'" '.$checkedon{$item}.' value="1" />'.&mt('Yes').
             '</label>&nbsp;<label><input type="radio" name="'.$item.'" '.
-            $checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'.
-            '</span>'.$additional.
-            '</td>'.
+            $checkedoff{$item}.' value="0" />'.&mt('No').'</label>'.
+            '</span></td>'.
             '</tr>';
         $itemcount ++;
     }
@@ -2451,100 +2464,42 @@ sub radiobutton_prefs {
 
 sub print_coursedefaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
-    my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles);
+    my ($css_class,$datatable);
     my $itemcount = 1;
-    my %choices =  &Apache::lonlocal::texthash (
-        canuse_pdfforms      => 'Course/Community users can create/upload PDF forms',
-        uploadquota          => 'Default quota for files uploaded directly to course/community using Course Editor (MB)',
-        anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
-        coursecredits        => 'Credits can be specified for courses',
-    );
-    my %staticdefaults = (
-                           anonsurvey_threshold => 10,
-                           uploadquota          => 500,
-                         );
     if ($position eq 'top') {
+        my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles);
+        %choices =
+            &Apache::lonlocal::texthash (
+                canuse_pdfforms => 'Course/Community users can create/upload PDF forms',
+        );
         %defaultchecked = ('canuse_pdfforms' => 'off');
-        @toggles = ('canuse_pdfforms');
+        @toggles = ('canuse_pdfforms',);
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
                                                  \%choices,$itemcount);
+        $$rowtotal += $itemcount;
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        my ($currdefresponder,$def_official_credits,$def_unofficial_credits,%curruploadquota);
-        my $currusecredits = 0;
-        my @types = ('official','unofficial','community');
+        my %choices =
+            &Apache::lonlocal::texthash (
+                anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
+        );
+        my $currdefresponder;
         if (ref($settings) eq 'HASH') {
             $currdefresponder = $settings->{'anonsurvey_threshold'};
-            if (ref($settings->{'uploadquota'}) eq 'HASH') {
-                foreach my $type (keys(%{$settings->{'uploadquota'}})) {
-                    $curruploadquota{$type} = $settings->{'uploadquota'}{$type};
-                }
-            }
-            if (ref($settings->{'coursecredits'}) eq 'HASH') {
-                $def_official_credits = $settings->{'coursecredits'}->{'official'};
-                $def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'};
-                if (($def_official_credits ne '') || ($def_unofficial_credits ne '')) {
-                    $currusecredits = 1;
-                }
-            }
         }
         if (!$currdefresponder) {
-            $currdefresponder = $staticdefaults{'anonsurvey_threshold'};
+            $currdefresponder = 10;
         } elsif ($currdefresponder < 1) {
             $currdefresponder = 1;
         }
-        foreach my $type (@types) {
-            if ($curruploadquota{$type} eq '') {
-                $curruploadquota{$type} = $staticdefaults{'uploadquota'};
-            }
-        }
         $datatable .=
-                '<tr'.$css_class.'><td><span class="LC_nobreak">'.
-                $choices{'anonsurvey_threshold'}.
+               '<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices{'anonsurvey_threshold'}.
                 '</span></td>'.
                 '<td class="LC_right_item"><span class="LC_nobreak">'.
                 '<input type="text" name="anonsurvey_threshold"'.
                 ' value="'.$currdefresponder.'" size="5" /></span>'.
-                '</td></tr>'."\n".
-                '<tr><td><span class="LC_nobreak">'.
-                $choices{'uploadquota'}.
-                '</span></td>'.
-                '<td align="right" class="LC_right_item">'.
-                '<table><tr>';
-        foreach my $type (@types) {
-            $datatable .= '<td align="center">'.&mt($type).'<br />'.
-                           '<input type="text" name="uploadquota_'.$type.'"'.
-                           ' value="'.$curruploadquota{$type}.'" size="5" /></td>';
-        }
-        $datatable .= '</tr></table></td></tr>'."\n";
-        $itemcount += 2;
-        my $onclick = 'toggleCredits(this.form);';
-        my $display = 'none';
-        if ($currusecredits) {
-            $display = 'block';
-        }
-        my $additional = '<div id="credits" style="display: '.$display.'">'.
-                         '<span class="LC_nobreak">'.
-                         &mt('Default credits for official courses [_1]',
-                         '<input type="text" name="official_credits" value="'.
-                         $def_official_credits.'" size="3" />').
-                         '</span><br />'.
-                         '<span class="LC_nobreak">'.
-                         &mt('Default credits for unofficial courses [_1]',
-                         '<input type="text" name="unofficial_credits" value="'.
-                         $def_unofficial_credits.'" size="3" />').
-                         '</span></div>'."\n";
-        %defaultchecked = ('coursecredits' => 'off');
-        @toggles = ('coursecredits');
-        my $current = {
-                        'coursecredits' => $currusecredits,
-                      };
-        (my $table,$itemcount) =
-            &radiobutton_prefs($current,\@toggles,\%defaultchecked,
-                               \%choices,$itemcount,$onclick,$additional);
-        $datatable .= $table;
+                '</td></tr>';
     }
-    $$rowtotal += $itemcount;
     return $datatable;
 }
 
@@ -3005,7 +2960,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 {
@@ -3021,7 +2976,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 {
@@ -3060,7 +3015,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>';
@@ -3144,7 +3099,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}) {
@@ -3216,7 +3171,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.
@@ -3236,7 +3191,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".
@@ -3295,8 +3250,6 @@ 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',
-                   'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
                  );
     my %short_titles = &Apache::lonlocal::texthash (
                            adminemail   => 'Admin E-mail address',
@@ -3339,12 +3292,12 @@ sub authorrequest_titles {
                                    automatic  => 'Automatic approval',
                  );
     return %titles;
-}
+} 
 
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
        approval    => '(Processing of request subject to approval by Domain Coordinator).',
-       validate   => '(Processing of request subject to institutional validation).',
+       validate   => '(Processing of request subject to instittutional validation).',
                  );
     return %conditions;
 }
@@ -3578,9 +3531,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".
@@ -3931,8 +3884,8 @@ sub print_scantronformat {
         $datatable .= '<td>'.&mt('Default in use:').'<br />'.
                       '<span class="LC_nobreak">';
         if ($scantronurl) {
-            $datatable .= &Apache::loncommon::modal_link($scantronurl,&mt('Default bubblesheet format file'),600,500,
-                                                         undef,undef,undef,undef,'background-color:#ffffff');
+            $datatable .= '<a href="'.$scantronurl.'" target="_blank">'.
+                          &mt('Default bubblesheet format file').'</a>';
         } else {
             $datatable = &mt('File unavailable for display');
         }
@@ -3957,12 +3910,11 @@ sub print_scantronformat {
             } 
             $datatable .= '<td>'.$errorstr.'</td><td>&nbsp;';
         } elsif ($scantronurl) {
-           my $link =  &Apache::loncommon::modal_link($scantronurl,&mt('Custom bubblesheet format file'),600,500,
-                                                       undef,undef,undef,undef,'background-color:#ffffff');
             $datatable .= '<td><span class="LC_nobreak">'.
-                          $link.
-                          '<label><input type="checkbox" name="scantronformat_del"'.
-                          ' value="1" />'.&mt('Delete?').'</label></span></td>'.
+                          '<a href="'.$scantronurl.'" target="_blank">'.
+                          &mt('Custom bubblesheet format file').'</a><label>'.
+                          '<input type="checkbox" name="scantronformat_del"'.
+                          '" value="1" />'.&mt('Delete?').'</label></span></td>'.
                           '<td><span class="LC_nobreak">&nbsp;'.
                           &mt('Replace:').'</span><br />';
         }
@@ -4260,7 +4212,7 @@ sub print_serverstatuses {
 
 sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
-            'checksums','clusterstatus','metadata_keywords','metadata_harvest',
+            'clusterstatus','metadata_keywords','metadata_harvest',
             'takeoffline','takeonline','showenv','toggledebug','ping','domconf');
 }
 
@@ -4418,7 +4370,7 @@ sub build_category_rows {
             if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
                 my $numchildren = @{$cats->[$depth]{$parent}};
                 my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                $text .= '<td><table class="LC_data_table">';
+                $text .= '<td><table class="LC_datatable">';
                 my ($idxnum,$parent_name,$parent_item);
                 my $higher = $depth - 1;
                 if ($higher == 0) {
@@ -4715,7 +4667,6 @@ 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');
@@ -4728,7 +4679,7 @@ sub modify_login {
     }
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
-    my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
+    my @toggles = ('coursecatalog','adminmail','newuser');
     foreach my $item (@toggles) {
         $loginhash{login}{$item} = $env{'form.'.$item};
     }
@@ -4890,7 +4841,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};
@@ -4916,10 +4867,9 @@ sub modify_login {
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
-        my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
+        my @toggles = ('coursecatalog','adminmail','newuser');
         my %defaultchecked = (
                     'coursecatalog' => 'on',
-                    'helpdesk'      => 'on',
                     'adminmail'     => 'off',
                     'newuser'       => 'off',
         );
@@ -5007,7 +4957,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 {
@@ -5068,7 +5018,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
-            fontmenu => "Font menu",
+            fontmenu => "Font Menu",
             pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
@@ -5120,45 +5070,24 @@ sub modify_colors {
     my @images;
     my $servadm = $r->dir_config('lonAdmEMail');
     my $errors;
-    my %defaults;
     foreach my $role (@{$roles}) {
         if ($role eq 'login') {
             %choices = &login_choices();
             @logintext = ('textcol','bgcol');
         } else {
             %choices = &color_font_choices();
+            $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
         }
         if ($role eq 'login') {
             @images = ('img','logo','domlogo','login');
             @bgs = ('pgbg','mainbg','sidebg');
         } else {
             @images = ('img');
-            @bgs = ('pgbg','tabbg','sidebg');
+            @bgs = ('pgbg','tabbg','sidebg'); 
         }
-        my %defaults = &role_defaults($role,\@bgs,\@links,\@images,\@logintext);
-        unless ($env{'form.'.$role.'_font'} eq $defaults{'font'}) {
-            $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
-        }
-        if ($role eq 'login') {
-            foreach my $item (@logintext) {
-                unless ($env{'form.'.$role.'_'.$item} eq  $defaults{'logintext'}{$item}) {
-                    $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
-                }
-            }
-        } else {
-            unless($env{'form.'.$role.'_fontmenu'} eq $defaults{'fontmenu'}) {
-                $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
-            }
-        }
-        foreach my $item (@bgs) {
-            unless ($env{'form.'.$role.'_'.$item} eq $defaults{'bgs'}{$item} ) {
-                $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
-            }
-        }
-        foreach my $item (@links) {
-            unless ($env{'form.'.$role.'_'.$item} eq  $defaults{'links'}{$item}) {
-                $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
-            }
+        $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
+        foreach my $item (@bgs,@links,@logintext) {
+            $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
         }
         my ($configuserok,$author_ok,$switchserver) = 
             &config_check($dom,$confname,$servadm);
@@ -5506,7 +5435,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);
@@ -5514,7 +5443,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]";
@@ -5531,14 +5460,14 @@ sub publishlogo {
         !defined(&Apache::loncommon::fileembstyle($1))) {
         $output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
     } elsif ($file=~/\.(\d+)\.(\w+)$/) {
-        $output = &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
+        $output = &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
     } elsif (-d "$filepath/$file") {
-        $output = &mt('Filename is a directory name - rename the file and re-upload');
+        $output = &mt('File name is a directory name - rename the file and re-upload');
     } else {
         my $source = $filepath.'/'.$file;
         my $logfile;
         if (!open($logfile,">>$source".'.log')) {
-            return (&mt('No write permission to Authoring Space'));
+            return (&mt('No write permission to Construction Space'));
         }
         print $logfile
 "\n================= Publish ".localtime()." ================\n".
@@ -5780,7 +5709,7 @@ sub modify_quotas {
         %limithash,$toolregexp,%conditions,$resulttext,%changes);
     if ($action eq 'quotas') {
         $context = 'tools'; 
-    } else { 
+    } else {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
@@ -5817,9 +5746,8 @@ sub modify_quotas {
         } else {
             if ($key =~ /^form\.quota_(.+)$/) {
                 $confhash{'defaultquota'}{$1} = $env{$key};
-            } elsif ($key =~ /^form\.authorquota_(.+)$/) {
-                $confhash{'authorquota'}{$1} = $env{$key};
-            } elsif ($key =~ /^form\.\Q$context\E_(.+)$/) {
+            }
+            if ($key =~ /^form\.\Q$context\E_(.+)$/) {
                 @{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key);
             }
         }
@@ -5845,7 +5773,6 @@ sub modify_quotas {
         }
     } else {
         $confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
-        $confhash{'authorquota'}{'default'} = $env{'form.authorquota'};
     }
     foreach my $item (@usertools) {
         foreach my $type (@{$types},'default','_LC_adv') {
@@ -5933,17 +5860,6 @@ sub modify_quotas {
                     }
                 }
             }
-            if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') {
-                foreach my $key (keys(%{$domconfig{'quotas'}{'authorquota'}})) {
-                    if (exists($confhash{'authorquota'}{$key})) {
-                        if ($confhash{'authorquota'}{$key} ne $domconfig{'quotas'}{'authorquota'}{$key}) {
-                            $changes{'authorquota'}{$key} = 1;
-                        }
-                    } else {
-                        $confhash{'authorquota'}{$key} = $domconfig{'quotas'}{'authorquota'}{$key};
-                    }
-                }
-            }
         }
         if (ref($confhash{'defaultquota'}) eq 'HASH') {
             foreach my $key (keys(%{$confhash{'defaultquota'}})) {
@@ -5962,21 +5878,6 @@ sub modify_quotas {
                 }
             }
         }
-        if (ref($confhash{'authorquota'}) eq 'HASH') {
-            foreach my $key (keys(%{$confhash{'authorquota'}})) {
-                if (ref($domconfig{'quotas'}) eq 'HASH') {
-                    if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') {
-                        if (!exists($domconfig{'quotas'}{'authorquota'}{$key})) {
-                            $changes{'authorquota'}{$key} = 1;
-                        }
-                    } else {
-                        $changes{'authorquota'}{$key} = 1;
-                    }
-                } else {
-                    $changes{'authorquota'}{$key} = 1;
-                }
-            }
-        }
     }
 
     if ($context eq 'requestauthor') {
@@ -5998,7 +5899,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>';
@@ -6013,26 +5914,13 @@ sub modify_quotas {
                     }
                     $resulttext .= '</ul></li>';
                 }
-                if (ref($changes{'authorquota'}) eq 'HASH') {
-                    $resulttext .= '<li>'.&mt('Authoring space default quotas').'<ul>';
-                    foreach my $type (@{$types},'default') {
-                        if (defined($changes{'authorquota'}{$type})) {
-                            my $typetitle = $usertypes->{$type};
-                            if ($type eq 'default') {
-                                $typetitle = $othertitle;
-                            }
-                            $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'authorquota'}{$type}).'</li>';
-                        }
-                    }
-                    $resulttext .= '</ul></li>';
-                }
             }
             my %newenv;
             foreach my $item (@usertools) {
                 my (%haschgs,%inconf);
                 if ($context eq 'requestauthor') {
                     %haschgs = %changes;
-                    %inconf = %confhash;
+                    %inconf = %confhash; 
                 } else {
                     if (ref($changes{$item}) eq 'HASH') {
                         %haschgs = %{$changes{$item}};
@@ -6046,7 +5934,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;
@@ -6612,7 +6500,7 @@ sub modify_directorysrch {
                         } else {
                             $chgtext =~ s/\; $//;
                         }
-                        $resulttext .=
+                        $resulttext .= 
                             '<li>'.
                             &mt("Users from domain '[_1]' permitted to search the institutional directory set to: [_2]",
                                 '<span class="LC_cusr_emph">'.$dom.'</span>',$chgtext).
@@ -6668,8 +6556,7 @@ sub modify_contacts {
     my (%others,%to,%bcc);
     my @contacts = ('supportemail','adminemail');
     my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
-                    'requestsmail','updatesmail','idconflictsmail');
-    my @toggles = ('reporterrors','reportupdates');
+                    'requestsmail');
     foreach my $type (@mailings) {
         @{$newsetting{$type}} = 
             &Apache::loncommon::get_env_multiple('form.'.$type);
@@ -6691,11 +6578,6 @@ sub modify_contacts {
         $to{$item} = $env{'form.'.$item};
         $contacts_hash{'contacts'}{$item} = $to{$item};
     }
-    foreach my $item (@toggles) {
-        if ($env{'form.'.$item} =~ /^(0|1)$/) {
-            $contacts_hash{'contacts'}{$item} = $env{'form.'.$item};
-        }
-    }
     if (keys(%currsetting) > 0) {
         foreach my $item (@contacts) {
             if ($to{$item} ne $currsetting{$item}) {
@@ -6730,11 +6612,10 @@ 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;
-           }
+           } 
         }
         foreach my $type (@mailings) {
             if ((@{$newsetting{$type}} != 1) || ($newsetting{$type}[0] ne $default{$type})) {
@@ -6751,14 +6632,6 @@ sub modify_contacts {
             }
         }
     }
-    foreach my $item (@toggles) {
-        if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) {
-            $changes{$item} = 1;
-        } elsif ((!$env{'form.'.$item}) &&
-                 (($currsetting{$item} eq '') || ($currsetting{$item} == 1))) {
-            $changes{$item} = 1;
-        }
-    }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash,
                                              $dom);
     if ($putresult eq 'ok') {
@@ -6793,23 +6666,6 @@ sub modify_contacts {
                     $resulttext .= '</li>';
                 }
             }
-            my @offon = ('off','on');
-            if ($changes{'reporterrors'}) {
-                $resulttext .= '<li>'.
-                               &mt('E-mail error reports to [_1] set to "'.
-                                   $offon[$env{'form.reporterrors'}].'".',
-                                   &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                       &mt('LON-CAPA core group - MSU'),600,500)).
-                               '</li>';
-            }
-            if ($changes{'reportupdates'}) {
-                $resulttext .= '<li>'.
-                                &mt('E-mail record of completed LON-CAPA updates to [_1] set to "'.
-                                    $offon[$env{'form.reportupdates'}].'".',
-                                    &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                        &mt('LON-CAPA core group - MSU'),600,500)).
-                                '</li>';
-            }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to contact information');
@@ -7110,7 +6966,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') {
@@ -7238,7 +7094,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'})) {
@@ -7277,7 +7133,7 @@ sub process_captcha {
                 $changes->{'cancreate'} = ['recaptchakeys'];
             }
         } else {
-            $changes->{'recaptchakeys'} = 1;
+            $changes->{'recaptchakeys'} = 1; 
         }
     }
     return;
@@ -7404,7 +7260,7 @@ sub modify_usermodification {
 }
 
 sub modify_defaults {
-    my ($dom,$r,%domconfig) = @_;
+    my ($dom,$r) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');
@@ -7490,17 +7346,8 @@ sub modify_defaults {
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
             if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'} || $changes{'datelocale_def'}) {
-                my $notify = 1;
-                if (ref($domconfig{'contacts'}) eq 'HASH') {
-                    if ($domconfig{'contacts'}{'reportupdates'} == 0) {
-                        $notify = 0;
-                    }
-                }
-                if ($notify) {
-                    &Apache::lonmsg::sendemail('installrecord@loncapa.org',
-                                               "LON-CAPA Domain Settings Change - $dom",
-                                               $mailmsgtext);
-                }
+                my $sysmail = $r->dir_config('lonSysEMail');
+                &Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext);
             }
         } else {
             $resulttext = &mt('No changes made to default authentication/language/timezone settings');
@@ -7970,8 +7817,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};
             }
         }
@@ -8007,14 +7854,8 @@ sub modify_coursedefaults {
     my ($dom,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%defaultshash);
     my %defaultchecked = ('canuse_pdfforms' => 'off');
+    my @offon = ('off','on');
     my @toggles = ('canuse_pdfforms');
-    my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
-                   'uploadquota_community');
-    my @types = ('official','unofficial','community');
-    my %staticdefaults = (
-                           anonsurvey_threshold => 10,
-                           uploadquota          => 500,
-                         );
 
     $defaultshash{'coursedefaults'} = {};
 
@@ -8030,7 +7871,7 @@ sub modify_coursedefaults {
                 if (($domconfig{'coursedefaults'}{$item} eq '') &&
                     ($env{'form.'.$item} eq '0')) {
                     $changes{$item} = 1;
-                } elsif ($domconfig{'coursedefaults'}{$item} ne $env{'form.'.$item}) {
+                } elsif ($domconfig{'coursdefaults'}{$item} ne $env{'form.'.$item}) {
                     $changes{$item} = 1;
                 }
             } elsif ($defaultchecked{$item} eq 'off') {
@@ -8043,80 +7884,26 @@ sub modify_coursedefaults {
             }
             $defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item};
         }
-        foreach my $item (@numbers) {
-            my ($currdef,$newdef);
-            my $newdef = $env{'form.'.$item};
-            if ($item eq 'anonsurvey_threshold') {
-                $currdef = $domconfig{'coursedefaults'}{$item};
-                $newdef =~ s/\D//g;
-                if ($newdef eq '' || $newdef < 1) {
-                    $newdef = 1;
-                }
-                $defaultshash{'coursedefaults'}{$item} = $newdef;
-            } else {
-                my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/);
-                if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
-                    $currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
-                }
-                $newdef =~ s/[^\w.\-]//g;
-                $defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef;
-            }
-            if ($currdef ne $newdef) {
-                my $staticdef;
-                if ($item eq 'anonsurvey_threshold') {
-                    unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
-                        $changes{$item} = 1;
-                    }
-                } else {
-                    unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) {
-                        $changes{'uploadquota'} = 1;
-                    }
-                }
-            }
-        }
-        my $officialcreds = $env{'form.official_credits'};
-        $officialcreds =~ s/^[^\d\.]//g;
-        my $unofficialcreds = $env{'form.unofficial_credits'};
-        $unofficialcreds =~ s/^[^\d\.]//g;
-        if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') &&
-                ($env{'form.coursecredits'} eq '1')) {
-                $changes{'coursecredits'} = 1;
-        } else {
-            if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds)  ||
-                ($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds)) {
-                $changes{'coursecredits'} = 1;
+        my $currdefresponder = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
+        my $newdefresponder = $env{'form.anonsurvey_threshold'};
+        $newdefresponder =~ s/\D//g;
+        if ($newdefresponder eq '' || $newdefresponder < 1) {
+            $newdefresponder = 1;
+        }
+        $defaultshash{'coursedefaults'}{'anonsurvey_threshold'} = $newdefresponder;
+        if ($currdefresponder ne $newdefresponder) {
+            unless ($currdefresponder eq '' && $newdefresponder == 10) {
+                $changes{'anonsurvey_threshold'} = 1;
             }
         }
-        $defaultshash{'coursedefaults'}{'coursecredits'} = {
-            official   => $officialcreds,
-            unofficial => $unofficialcreds,
-        }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                              $dom);
     if ($putresult eq 'ok') {
-        my %domdefaults;
         if (keys(%changes) > 0) {
-            if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || ($changes{'uploadquota'})) {
-                %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-                if ($changes{'canuse_pdfforms'}) {
-                    $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
-                }
-                if ($changes{'coursecredits'}) {
-                    if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
-                        $domdefaults{'officialcredits'} =
-                            $defaultshash{'coursedefaults'}{'coursecredits'}{'official'};
-                        $domdefaults{'unofficialcredits'} =
-                            $defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'};
-                    }
-                }
-                if ($changes{'uploadquota'}) {
-                    if (ref($defaultshash{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
-                        foreach my $type (@types) {
-                            $domdefaults{$type.'quota'}=$defaultshash{'coursedefaults'}{'uploadquota'}{$type};
-                        }
-                    }
-                }
+            if ($changes{'canuse_pdfforms'}) {
+                my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+                $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
                 my $cachetime = 24*60*60;
                 &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
             }
@@ -8130,32 +7917,6 @@ sub modify_coursedefaults {
                     }
                 } elsif ($item eq 'anonsurvey_threshold') {
                         $resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
-                } elsif ($item eq 'uploadquota') {
-                    if (ref($defaultshash{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
-                        $resulttext .= '<li>'.&mt('Default quota for content uploaded to a course/community via Course Editor set as follows:').'<ul>'.
-                                       '<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'.
-                                       '<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'.
-                                       '<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'.
-                                       '</ul>'.
-                                       '</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>';
-                    }
-                } elsif ($item eq 'coursecredits') {
-                    if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
-                        if (($domdefaults{'officialcredits'} eq '') &&
-                            ($domdefaults{'unofficialcredits'} eq '')) {
-                            $resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('Student credits can be set per course by a Domain Coordinator, with the following defaults applying:').'<ul>'.
-                                           '<li>'.&mt('Official courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}).'</li>'.
-                                           '<li>'.&mt('Unofficial courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}).'</li>'.
-                                           '</ul>'.
-                                           '</li>';
-                        }
-                    } else {
-                        $resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>';
-                    }
                 }
             }
             $resulttext .= '</ul>';
@@ -8464,7 +8225,7 @@ sub modify_loadbalancing {
         if ($balancer eq '') {
             next;
         }
-        if (!exists($servers{$balancer})) {
+        if (!exists($servers{$balancer})) { 
             if (exists($currbalancer{$balancer})) {
                 push(@{$changes{'delete'}},$balancer);
             }
@@ -8515,14 +8276,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) {
@@ -8531,7 +8292,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};
                 }
@@ -8556,7 +8317,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') {
@@ -8566,7 +8327,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);
                     }
                 }
@@ -8612,7 +8373,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>';     
                                     }
                                 }
                             }
@@ -8672,7 +8433,7 @@ sub recurse_cat_deletes {
                 delete($coursecategories->{$subitem});
                 $deletions->{$subitem} = 1;
                 &recurse_cat_deletes($subitem,$coursecategories,$deletions);
-            }  
+            }
         }
     }
     return;
@@ -8680,94 +8441,73 @@ sub recurse_cat_deletes {
 
 sub get_active_dcs {
     my ($dom) = @_;
-    my $now = time;
-    my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now);
+    my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);
     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);
-            $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
+            my ($end,$start) = split(':',$dompersonnel{$server}{$user});
+            if (($end eq '') || ($end == 0) || ($end > $now)) {
+                if ($start <= $now) {
+                    $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
+                }
+            }
         }
     }
     return %domcoords;
 }
 
 sub active_dc_picker {
-    my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
+    my ($dom,$curr_dc) = @_;
     my %domcoords = &get_active_dcs($dom); 
-    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;
+    my @dcs = sort(keys(%domcoords));
+    my $numdcs = scalar(@dcs); 
+    my $datatable;
+    my $numinrow = 2;
     if ($numdcs > 1) {
-        $table = '<table>';
-        for (my $i=0; $i<@domcoord; $i++) {
+        $datatable = '<table>';
+        for (my $i=0; $i<@dcs; $i++) {
             my $rem = $i%($numinrow);
             if ($rem == 0) {
                 if ($i > 0) {
-                    $table .= '</tr>';
+                    $datatable .= '</tr>';
                 }
-                $table .= '<tr>';
-                $rows ++;
+                $datatable .= '<tr>';
             }
-            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"';
+            my $check = ' ';
+            if ($curr_dc eq '') {
+                if (!$i) { 
+                    $check = ' checked="checked" ';
                 }
+            } elsif ($dcs[$i] eq $curr_dc) {
+                $check = ' checked="checked" ';
             }
-            if ($i == @domcoord - 1) {
+            if ($i == @dcs - 1) {
                 my $colsleft = $numinrow - $rem;
                 if ($colsleft > 1) {
-                    $table .= '<td class="LC_left_item" colspan="'.$colsleft.'">';
+                    $datatable .= '<td colspan="'.$colsleft.'">';
                 } else {
-                    $table .= '<td class="LC_left_item">';
+                    $datatable .= '<td>';
                 }
             } else {
-                $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>';
-            }
-        }
-        $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"';
+                $datatable .= '<td>';
             }
-            $table .= '<input type="checkbox" name="'.$name.'" '.
-                      'value="'.$domcoord[0].'"'.$check.' />';
-            $rows ++;
+            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).
+                          ' ('.$dcname.':'.$dcdom.')'.
+                          '</label></span></td>';
         }
+        $datatable .= '</tr></table>';
+    } elsif (@dcs) {
+        $datatable .= '<input type="hidden" name="autocreate_dc" value="'.
+                      $dcs[0].'" />';
     }
-    return ($numdcs,$table,$rows);
+    return ($numdcs,$datatable);
 }
 
 sub usersession_titles {
@@ -8839,7 +8579,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">
@@ -8922,12 +8662,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);
-
+                    
                 }
             }
         }
@@ -9000,7 +8740,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++) {
@@ -9287,40 +9027,6 @@ function updateCaptcha(caller,context) {
         }
     }
     return;
-}
-
-// ]]>
-</script>
-
-END
-
-}
-
-sub credits_js {
-    return <<"END";
-
-<script type="text/javascript">
-// <![CDATA[
-
-function toggleCredits(domForm) {
-    if (document.getElementById('credits')) {
-        creditsitem = document.getElementById('credits');
-        var creditsLength = domForm.coursecredits.length;
-        if (creditsLength) {
-            var currval;
-            for (var i=0; i<creditsLength; i++) {
-                if (domForm.coursecredits[i].checked) {
-                   currval = domForm.coursecredits[i].value;
-                }
-            }
-            if (currval == 1) {
-                creditsitem.style.display = 'block';
-            } else {
-                creditsitem.style.display = 'none';
-            }
-        }
-    }
-    return;
 }
 
 // ]]>