--- loncom/interface/domainprefs.pm	2010/02/22 18:39:13	1.102.2.9
+++ loncom/interface/domainprefs.pm	2010/03/21 20:33:47	1.132
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.102.2.9 2010/02/22 18:39:13 raeburn Exp $
+# $Id: domainprefs.pm,v 1.132 2010/03/21 20:33:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -202,11 +202,12 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','coursedefaults'],$dom);
+                'serverstatuses','requestcourses','helpsettings',
+                'coursedefaults'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses',
+                       'requestcourses','coursecategories','serverstatuses','helpsettings',
                        'coursedefaults');
     my %prefs = (
         'rolecolors' =>
@@ -221,12 +222,13 @@ sub handler {
                                 {col1 => 'Administrator Settings',
                                  col2 => '',}],
                     },
-        'login' =>  
+        'login' =>
                     { text => 'Log-in page options',
                       help => 'Domain_Configuration_Login_Page',
                       header => [{col1 => 'Item',
                                   col2 => '',}],
                     },
+
         'defaults' => 
                     { text => 'Default authentication/language/timezone',
                       help => 'Domain_Configuration_LangTZAuth',
@@ -251,11 +253,13 @@ sub handler {
                      help => 'Domain_Configuration_Auto_Updates',
                      header => [{col1 => 'Setting',
                                  col2 => 'Value',},
+                                {col1 => 'Setting',
+                                 col2 => 'Affiliation'},
                                 {col1 => 'User population',
-                                 col2 => 'Updataeable user data'}],
+                                 col2 => 'Updateable user data'}],
                   },
         'autocreate' => 
-                  {  text => 'Auto-course creation settings',
+                  { text => 'Auto-course creation settings',
                      help => 'Domain_Configuration_Auto_Creation',
                      header => [{col1 => 'Configuration Setting',
                                  col2 => 'Value',}],
@@ -325,13 +329,37 @@ sub handler {
                               col3 => 'Specific IPs',
                             }],
                  },
-        'coursedefaults' =>
+        'helpsettings' =>
+                 {text   => 'Help page settings',
+                  help   => 'Domain_Configuration_Help_Settings',
+                  header => [{col1 => 'Authenticated Help Settings',
+                              col2 => ''},
+                             {col1 => 'Unauthenticated Help Settings',
+                              col2 => ''}],
+                 },
+        'coursedefaults' => 
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
                   header => [{col1 => 'Setting',
                               col2 => 'Value',}],
                  },
+        'privacy' => 
+                 {text   => 'User Privacy',
+                  help   => 'Domain_Configuration_User_Privacy',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
+                 },
     );
+    my %servers = &dom_servers($dom);
+    if (keys(%servers) > 1) {
+        $prefs{'login'}  = { text   => 'Log-in page options',
+                             help   => 'Domain_Configuration_Login_Page',
+                            header => [{col1 => 'Log-in Service',
+                                        col2 => 'Server Setting',},
+                                       {col1 => 'Log-in Page Items',
+                                        col2 => ''}],
+                           };
+    }
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -419,6 +447,8 @@ sub process_changes {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $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);
     }
@@ -446,7 +476,7 @@ sub print_config_box {
     }
     if ($numheaders > 1) {
         my $colspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'coursecategories')) {
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || ($action eq 'helpsettings')) {
             $colspan = ' colspan="2"';
         }
         $output .= '
@@ -466,9 +496,14 @@ sub print_config_box {
             $output .= &print_usermodification('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal);
+        } elsif ($action eq 'login') {
+            $output .= &print_login('top',$dom,$confname,$phase,$settings,\$rowtotal);
+            $colspan = ' colspan="2"';
         } elsif ($action eq 'requestcourses') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } else {
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
         }
         $output .= '
@@ -485,7 +520,18 @@ sub print_config_box {
              </tr>';
             $rowtotal ++;
         if ($action eq 'autoupdate') {
-            $output .= &print_autoupdate('bottom',$dom,$settings,\$rowtotal);
+            $output .= &print_autoupdate('middle',$dom,$settings,\$rowtotal).'
+           </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+            &print_autoupdate('bottom',$dom,$settings,\$rowtotal);
+            $rowtotal ++;
         } elsif ($action eq 'usercreation') {
             $output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).'
            </table>
@@ -510,14 +556,17 @@ sub print_config_box {
              <tr class="LC_info_row">
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
               <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
-
                        &print_usermodification('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
         } elsif ($action eq 'coursecategories') {
             $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
+        } elsif ($action eq 'login') {
+            $output .= &print_login('bottom',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
             $output .= &print_courserequestmail($dom,$settings,\$rowtotal);
-        } else {
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
           </td>
@@ -585,7 +634,8 @@ sub print_config_box {
         $output .= '</tr>';
         $rowtotal ++;
         if ($action eq 'login') {
-            $output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal);
+            $output .= &print_login('bottom',$dom,$confname,$phase,$settings,
+                                    \$rowtotal);
         } elsif ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif ($action eq 'autoenroll') {
@@ -602,7 +652,9 @@ sub print_config_box {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'serverstatuses') {
             $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'coursedefaults') {
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
+    	} elsif ($action eq 'coursedefaults') {
             $output .= &print_coursedefaults($dom,$settings,\$rowtotal);
         }
     }
@@ -615,8 +667,79 @@ sub print_config_box {
 }
 
 sub print_login {
-    my ($dom,$confname,$phase,$settings,$rowtotal) = @_;
+    my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_;
+    my ($css_class,$datatable);
     my %choices = &login_choices();
+
+    if ($position eq 'top') {
+        my %servers = &dom_servers($dom);
+        my $choice = $choices{'disallowlogin'};
+        $css_class = ' class="LC_odd_row"';
+        $datatable .= '<tr'.$css_class.'><td>'.$choice.'</td>'.
+                      '<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'.
+                      '<th>'.$choices{'server'}.'</th>'.
+                      '<th>'.$choices{'serverpath'}.'</th>'.
+                      '<th>'.$choices{'custompath'}.'</th>'.
+                      '<th><span class="LC_nobreak">'.$choices{'exempt'}.'</span></th></tr>'."\n";
+        my %disallowed;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'loginvia'}) eq 'HASH') {
+               %disallowed = %{$settings->{'loginvia'}};
+            }
+        }
+        foreach my $lonhost (sort(keys(%servers))) {
+            my $direct = 'selected="selected"';
+            if (ref($disallowed{$lonhost}) eq 'HASH') {
+                if ($disallowed{$lonhost}{'server'} ne '') {
+                    $direct = '';
+                }
+            }
+            $datatable .= '<tr><td>'.$servers{$lonhost}.'</td>'.
+                          '<td><select name="'.$lonhost.'_server">'.
+                          '<option value=""'.$direct.'>'.$choices{'directlogin'}.
+                          '</option>';
+            foreach my $hostid (keys(%servers)) {
+                next if ($servers{$hostid} eq $servers{$lonhost});
+                my $selected = '';
+                if (ref($disallowed{$lonhost}) eq 'HASH') {
+                    if ($hostid eq $disallowed{$lonhost}{'server'}) {
+                        $selected = 'selected="selected"';
+                    }
+                }
+                $datatable .= '<option value="'.$hostid.'"'.$selected.'>'.
+                              $servers{$hostid}.'</option>';
+            }
+            $datatable .= '</select></td>'.
+                          '<td><select name="'.$lonhost.'_serverpath">';
+            foreach my $path ('','/','/adm/login','/adm/roles','custom') {
+                my $pathname = $path;
+                if ($path eq 'custom') {
+                    $pathname = &mt('Custom Path').' ->';
+                }
+                my $selected = '';
+                if (ref($disallowed{$lonhost}) eq 'HASH') {
+                    if ($path eq $disallowed{$lonhost}{'serverpath'}) {
+                        $selected = 'selected="selected"';
+                    }
+                } elsif ($path eq '') {
+                    $selected = 'selected="selected"';
+                }
+                $datatable .= '<option value="'.$path.'"'.$selected.'>'.$pathname.'</option>';
+            }
+            $datatable .= '</select></td>';
+            my ($custom,$exempt);
+            if (ref($disallowed{$lonhost}) eq 'HASH') {
+                $custom = $disallowed{$lonhost}{'custompath'};
+                $exempt = $disallowed{$lonhost}{'exempt'};
+            }
+            $datatable .= '<td><input type="text" name="'.$lonhost.'_custompath" size="6" value="'.$custom.'" /></td>'.
+                          '<td><input type="text" name="'.$lonhost.'_exempt" size="8" value="'.$exempt.'" /></td>'.
+                          '</tr>';
+        }
+        $datatable .= '</table></td></tr>';
+        return $datatable;
+    }
+
     my %defaultchecked = ( 
                            'coursecatalog' => 'on',
                            'adminmail'     => 'off',
@@ -752,23 +875,30 @@ sub login_choices {
     my %choices =
         &Apache::lonlocal::texthash (
             coursecatalog => 'Display Course/Community Catalog link?',
-            adminmail => "Display Administrator's E-mail Address?",
-            newuser   => "Link to create a user account",
-            img => "Header",
-            logo => "Main Logo",
-            domlogo => "Domain Logo",
-            login => "Log-in Header", 
-            textcol => "Text color",
-            bgcol   => "Box color",
-            bgs => "Background colors",
-            links => "Link colors",
-            font => "Font color",
-            pgbg => "Header",
-            mainbg => "Page",
-            sidebg => "Login box",
-            link => "Link",
-            alink => "Active link",
-            vlink => "Visited link",
+            adminmail     => "Display Administrator's E-mail Address?",
+            disallowlogin => "Login page requests redirected",
+            hostid        => "Server",
+            server        => "Redirect to:",
+            serverpath    => "Path",
+            custompath    => "Custom", 
+            exempt        => "Exempt IP(s)",
+            directlogin   => "No redirect",
+            newuser       => "Link to create a user account",
+            img           => "Header",
+            logo          => "Main Logo",
+            domlogo       => "Domain Logo",
+            login         => "Log-in Header", 
+            textcol       => "Text color",
+            bgcol         => "Box color",
+            bgs           => "Background colors",
+            links         => "Link colors",
+            font          => "Font color",
+            pgbg          => "Header",
+            mainbg        => "Page",
+            sidebg        => "Login box",
+            link          => "Link",
+            alink         => "Active link",
+            vlink         => "Visited link",
         );
     return %choices;
 }
@@ -786,6 +916,7 @@ sub print_rolecolors {
     my %defaults = (
                    img => $defaultdesign{$role.'.img'},
                    font => $defaultdesign{$role.'.font'},
+		   fontmenu => $defaultdesign{$role.'.fontmenu'},
                    );
     foreach my $item (@bgs) {
         $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
@@ -803,6 +934,10 @@ sub print_rolecolors {
                 $designs{'font'} = $settings->{$role}->{'font'};
                 $is_custom{'font'} = 1;
             }
+            if ($settings->{$role}->{'fontmenu'} ne '') {
+                $designs{'fontmenu'} = $settings->{$role}->{'fontmenu'};
+                $is_custom{'fontmenu'} = 1;
+            }
             foreach my $item (@bgs) {
                 if ($settings->{$role}->{$item} ne '') {
                     $designs{'bgs'}{$item} = $settings->{$role}->{$item};
@@ -821,6 +956,10 @@ sub print_rolecolors {
             $designs{img} = $designhash{$dom.'.'.$role.'.img'};
             $is_custom{'img'} = 1;
         }
+        if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') {
+            $designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'};
+            $is_custom{'fontmenu'} = 1; 
+        }
         if ($designhash{$dom.'.'.$role.'.font'} ne '') {
             $designs{font} = $designhash{$dom.'.'.$role.'.font'};
             $is_custom{'font'} = 1;
@@ -849,7 +988,7 @@ sub display_color_options {
     my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
         $images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_;
     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $datatable = '<tr'.$css_class.'>'.
+    my $datatable = '<tr>'.
         '<td>'.$choices->{'font'}.'</td>';
     if (!$is_custom->{'font'}) {
         $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
@@ -863,6 +1002,22 @@ sub display_color_options {
                   '&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>';
+        if (!$is_custom->{'fontmenu'}) {
+            $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
+        } else {
+            $datatable .= '<td>&nbsp;</td>';
+        }
+        $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'});
+        $datatable .= '<td><span class="LC_nobreak">'.
+                      '<input type="text" size="10" name="'.$role.'_fontmenu"'.
+                      ' value="'.$designs->{'fontmenu'}.'" />&nbsp;'.$fontlink.
+                      '&nbsp;<span id="css_'.$role.'_fontmenu" style="background-color: '.
+                      $designs->{'fontmenu'}.';">&nbsp;&nbsp;&nbsp;</span>'.
+                      '</span></td></tr>';
+    }
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
 	$itemcount ++;
@@ -1249,7 +1404,7 @@ sub print_quotas {
                 if ($context eq 'requestcourses') {
                     $datatable .= '</tr><tr>';
                     foreach my $item (@usertools) {
-                        $datatable .= '<td style="vertical-align: top;">'.$cell{$item}.'</td>';  
+                        $datatable .= '<td style="vertical-align: top">'.$cell{$item}.'</td>';  
                     }
                     $datatable .= '</tr></table>';
                 }
@@ -1355,7 +1510,7 @@ sub print_quotas {
     if ($context eq 'requestcourses') {
         $datatable .= '</tr><tr>';
         foreach my $item (@usertools) {
-            $datatable .= '<td style="vertical-align: top;">'.$defcell{$item}.'</td>';
+            $datatable .= '<td style="vertical-align: top">'.$defcell{$item}.'</td>';
         }
         $datatable .= '</tr></table>';
     }
@@ -1458,7 +1613,7 @@ sub print_quotas {
     if ($context eq 'requestcourses') {
         $datatable .= '</tr><tr>';
         foreach my $item (@usertools) {
-            $datatable .= '<td style="vertical-align: top;">'.$advcell{$item}.'</td>';
+            $datatable .= '<td style="vertical-align: top">'.$advcell{$item}.'</td>';
         }
         $datatable .= '</tr></table>';
     }
@@ -1548,7 +1703,7 @@ sub print_courserequestmail {
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($defdom,$runon,$runoff);
+    my ($defdom,$runon,$runoff,$coownerson,$coownersoff);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -1567,6 +1722,18 @@ sub print_autoenroll {
                 $runon = ' ';
             }
         }
+        if (exists($settings->{'co-owners'})) {
+            if ($settings->{'co-owners'} eq '0') {
+                $coownersoff = ' checked="checked" ';
+                $coownerson = ' ';
+            } else {
+                $coownerson = ' checked="checked" ';
+                $coownersoff = ' ';
+            }
+        } else {
+            $coownersoff = ' checked="checked" ';
+            $coownerson = ' ';
+        }
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
@@ -1597,8 +1764,16 @@ sub print_autoenroll {
                   &mt('username').':&nbsp;'.
                   '<input type="text" name="sender_uname" value="'.
                   $notif_sender.'" size="10" />&nbsp;&nbsp;'.&mt('domain').
-                  ':&nbsp;'.$domform.'</span></td></tr>';
-    $$rowtotal += 2;
+                  ':&nbsp;'.$domform.'</span></td></tr>'.
+                  '<tr class="LC_odd_row">'.
+                  '<td>'.&mt('Automatically assign co-ownership').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="autoassign_coowners"'.
+                  $coownerson.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="autoassign_coowners"'.
+                  $coownersoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                  '</tr>';
+    $$rowtotal += 3;
     return $datatable;
 }
 
@@ -1640,9 +1815,17 @@ sub print_autoupdate {
                   $classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr>';
         $$rowtotal += 2;
+    } elsif ($position eq 'middle') {
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+        my $numinrow = 3;
+        my $locknamesettings;
+        $datatable .= &insttypes_row($settings,$types,$usertypes,
+                                     $dom,$numinrow,$othertitle,
+                                    'lockablenames');
+        $$rowtotal ++;
     } else {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        my @fields = ('lastname','firstname','middlename','gen',
+        my @fields = ('lastname','firstname','middlename','generation',
                       'permanentemail','id');
         my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
         my $numrows = 0;
@@ -1697,7 +1880,7 @@ sub print_autocreate {
     my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc);
     if ($numdc > 1) {
         $datatable .= '</td><tr><td>'.
-                      &mt('XML files processed as: (choose Dom. Coord.)').
+                      &mt('XML files processed as: (choose Dom. Coord.)'). 
                       '</td><td class="LC_left_item">'.$dctable.'</td></tr>'.
                       '<tr class="LC_odd_row">';
         $$rowtotal ++ ;
@@ -1902,6 +2085,100 @@ sub print_contacts {
     return $datatable;
 }
 
+sub print_helpsettings {
+
+	my ($position,$dom,$confname,$settings,$rowtotal) = @_;
+	my ($css_class,$datatable);
+	
+	my $switchserver = &check_switchserver($dom,$confname);
+	
+	my $itemcount = 1;
+	
+	if ($position eq 'top') {
+		
+		my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles);
+		
+		%choices =
+			&Apache::lonlocal::texthash (
+				submitbugs => 'Display &quot;Submit a bug&quot; link?',
+		);
+		
+		%defaultchecked = ('submitbugs' => 'on');
+		
+		@toggles = ('submitbugs',);
+		
+		foreach my $item (@toggles) {
+			if ($defaultchecked{$item} eq 'on') { 
+				$checkedon{$item} = ' checked="checked" ';
+				$checkedoff{$item} = ' ';
+			} elsif ($defaultchecked{$item} eq 'off') {
+				$checkedoff{$item} = ' checked="checked" ';
+				$checkedon{$item} = ' ';
+			}
+		}
+		
+		if (ref($settings) eq 'HASH') {
+			foreach my $item (@toggles) {
+				if ($settings->{$item} eq '1') {
+					$checkedon{$item} =  ' checked="checked" ';
+					$checkedoff{$item} = ' ';
+				} elsif ($settings->{$item} eq '0') {
+					$checkedoff{$item} =  ' checked="checked" ';
+					$checkedon{$item} = ' ';
+				}
+			}
+		 }
+		
+		 foreach my $item (@toggles) {
+			$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+			$datatable .=  
+				'<tr'.$css_class.'>
+				<td><span class="LC_nobreak">'.$choices{$item}.'</span></td>
+				<td><span class="LC_nobreak">&nbsp;</span></td>
+				<td class="LC_right_item"><span class="LC_nobreak">
+				<label><input type="radio" name="'.$item.'" '.$checkedon{$item}.' value="1" />'.&mt('Yes').'</label>&nbsp;
+				<label><input type="radio" name="'.$item.'" '.$checkedoff{$item}.' value="0" />'.&mt('No').'</label>'.
+				'</span></td>'.
+				'</tr>';
+			$itemcount ++;
+		 }
+     
+     } else {
+     
+     	$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+     	
+     	$datatable .= '<tr'.$css_class.'>';
+     	
+     	if (ref($settings) eq 'HASH') {
+			if ($settings->{'loginhelpurl'} ne '') {
+				my($directory, $filename) = $settings->{'loginhelpurl'} =~ m/(.*\/)(.*)$/;
+				$datatable .= '<td width="33%"><span class="LC_left_item"><label><a href="'.$settings->{'loginhelpurl'}.'" target="_blank">'.&mt('Custom Login Page Help File In Use').'</a></label></span></td>';
+				$datatable .= '<td width="33%"><span class="LC_right_item"><label><input type="checkbox" name="loginhelpurl_del" value="1" />'.&mt('Delete?').'</label></span></td>'
+			} else {
+				$datatable .= '<td width="33%"><span class="LC_left_item"><label>'.&mt('Default Login Page Help File In Use').'</label></span></td>';
+				$datatable .= '<td width="33%"><span class="LC_right_item">&nbsp;</span></td>';
+			}
+		} else {
+			$datatable .= '<td><span class="LC_left_item">&nbsp;</span></td>';
+			$datatable .= '<td><span class="LC_right_item">&nbsp;</span></td>';
+		}
+    	
+     	$datatable .= '<td width="33%"><span class="LC_right_item">';
+     	if ($switchserver) {
+            $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+        } else {
+        	$datatable .= &mt('Upload Custom Login Page Help File:');
+            $datatable .='<input type="file" name="loginhelpurl" />';
+        }
+        $datatable .= '</span></td></tr>';
+        
+     }
+     
+     return $datatable;
+	
+}
+
+
 sub radiobutton_prefs {
     my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_;
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
@@ -2008,7 +2285,7 @@ sub courserequest_titles {
 
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
-       approval   => '(Processing of request subject to approval by Domain Coordinator).',
+       approval    => '(Processing of request subject to approval by Domain Coordinator).',
        validate   => '(Processing of request subject to instittutional validation).',
                  );
     return %conditions;
@@ -2504,7 +2781,7 @@ sub print_scantronformat {
                       '<span class="LC_nobreak">';
         if ($scantronurl) {
             $datatable .= '<a href="'.$scantronurl.'" target="_blank">'.
-                          &mt('Default scantron format file').'</a>';
+                          &mt('Default bubblesheet format file').'</a>';
         } else {
             $datatable = &mt('File unavailable for display');
         }
@@ -2531,7 +2808,7 @@ sub print_scantronformat {
         } elsif ($scantronurl) {
             $datatable .= '<td><span class="LC_nobreak">'.
                           '<a href="'.$scantronurl.'" target="_blank">'.
-                          &mt('Custom scantron format file').'</a><label>'.
+                          &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;'.
@@ -2560,7 +2837,7 @@ sub legacy_scantronformat {
             &publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron',
                          '','',$newfile);
         if ($result ne 'ok') {
-            $error = &mt("An error occurred publishing the [_1] scantron format file in RES space. Error was: [_2].",$newfile,$result);
+            $error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result);
         }
     }
     return ($url,$error);
@@ -2604,8 +2881,8 @@ sub print_coursecategories {
                      categorizecomm => 'Assign a category to a community',
                     );
         my %level = &Apache::lonlocal::texthash (
-                     dom => 'Set in Domain',
-                     crs => 'Set in Course',   
+                     dom  => 'Set in Domain',
+                     crs  => 'Set in Course',
                      comm => 'Set in Community',
                     );
         $datatable = '<tr class="LC_odd_row">'.
@@ -2664,9 +2941,9 @@ sub print_coursecategories {
                           communities => &mt('Communities'),
                     );
 
-                    if ((!grep(/^instcode$/,@{$cats[0]})) ||
+                    if ((!grep(/^instcode$/,@{$cats[0]})) || 
                         ($cathash->{'instcode::0'} eq '') ||
-                        (!grep(/^communities$/,@{$cats[0]})) ||
+                        (!grep(/^communities$/,@{$cats[0]})) || 
                         ($cathash->{'communities::0'} eq '')) {
                         $maxnum ++;
                     }
@@ -2760,7 +3037,7 @@ sub print_coursecategories {
                                           '<td><span class="LC_nobreak">'.
                                           $default_names{$default}.'</span>';
                             if ($default eq 'instcode') {
-                                $datatable .= '<br /><span class="LC_nobreak">('
+                                $datatable .= '<br /><span class="LC_nobreak">(' 
                                               .&mt('with institutional codes').')</span>';
                             }
                             $datatable .= '</td>'
@@ -2859,7 +3136,7 @@ sub coursecategories_javascript {
     }
     my $instcode_reserved = &mt('The name: "instcode" is a reserved category');
     my $communities_reserved = &mt('The name: "communities" is a reserved category');
-    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category');
+    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category'); 
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -3140,6 +3417,7 @@ sub insttypes_row {
     my %lt = &Apache::lonlocal::texthash (
                       cansearch => 'Users allowed to search',
                       statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)',
+                      lockablenames => 'User preference to lock name',
              );
     my $showdom;
     if ($context eq 'cansearch') {
@@ -3176,10 +3454,12 @@ sub insttypes_row {
                            $usertypes->{$types->[$i]}.'</label></span></td>';
             }
         }
-       
         $rem = @{$types}%($numinrow);
     }
     my $colsleft = $numinrow - $rem;
+    if (($rem == 0) && (@{$types} > 0)) {
+        $output .= '<tr>';
+    }
     if ($colsleft > 1) {
         $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
     } else {
@@ -3281,6 +3561,14 @@ sub modify_login {
                   newuser => 'Link for visitors to create a user account',
                   loginheader => 'Log-in box header');
     my @offon = ('off','on');
+    my %curr_loginvia;
+    if (ref($domconfig{login}) eq 'HASH') {
+        if (ref($domconfig{login}{loginvia}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) {
+                $curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost};
+            }
+        }
+    }
     my %loginhash;
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
@@ -3293,6 +3581,93 @@ sub modify_login {
         $colchgtext = &display_colorchgs($dom,\%colchanges,['login'],
                                          \%loginhash);
     }
+
+    my %servers = &dom_servers($dom);
+    my @loginvia_attribs = ('serverpath','custompath','exempt');
+    if (keys(%servers) > 1) {
+        foreach my $lonhost (keys(%servers)) {
+            next if ($env{'form.'.$lonhost.'_server'} eq $lonhost);
+            if (ref($curr_loginvia{$lonhost}) eq 'HASH') {
+                if ($env{'form.'.$lonhost.'_server'} eq $curr_loginvia{$lonhost}{'server'}) {
+                    $loginhash{login}{loginvia}{$lonhost}{'server'} = $curr_loginvia{$lonhost}{'server'};
+                } elsif ($curr_loginvia{$lonhost}{'server'} ne '') {
+                    if (defined($servers{$env{'form.'.$lonhost.'_server'}})) {
+                        $loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'};
+                        $changes{'loginvia'}{$lonhost} = 1;
+                    } else {
+                        $loginhash{login}{loginvia}{$lonhost}{'server'} = '';
+                        $changes{'loginvia'}{$lonhost} = 1;
+                    }
+                } else {
+                    if (defined($servers{$env{'form.'.$lonhost.'_server'}})) {
+                        $loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'};
+                        $changes{'loginvia'}{$lonhost} = 1;
+                    }
+                }
+                if ($loginhash{login}{loginvia}{$lonhost}{'server'} eq '') {
+                    foreach my $item (@loginvia_attribs) {
+                        $loginhash{login}{loginvia}{$lonhost}{$item} = '';
+                    }
+                } else {
+                    foreach my $item (@loginvia_attribs) {
+                        my $new = $env{'form.'.$lonhost.'_'.$item};
+                        if (($item eq 'serverpath') && ($new eq 'custom')) {
+                            $env{'form.'.$lonhost.'_custompath'} =~ s/\s+//g;
+                            if ($env{'form.'.$lonhost.'_custompath'} eq '') {
+                                $new = '/';
+                            }
+                        }
+                        if (($item eq 'custompath') && 
+                            ($env{'form.'.$lonhost.'_serverpath'} ne 'custom')) {
+                            $new = '';
+                        }
+                        if ($new ne $curr_loginvia{$lonhost}{$item}) {
+                            $changes{'loginvia'}{$lonhost} = 1;
+                        }
+                        if ($item eq 'exempt') {
+                            $new =~ s/^\s+//;
+                            $new =~ s/\s+$//;
+                            my @poss_ips = split(/\s*[,:]\s*/,$new);
+                            my @okips;
+                            foreach my $ip (@poss_ips) {
+                                if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
+                                    if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) {
+                                        push(@okips,$ip); 
+                                    }
+                                }
+                            }
+                            if (@okips > 0) {
+                                $new = join(',',@okips); 
+                            } else {
+                                $new = ''; 
+                            }
+                        }
+
+                        $loginhash{login}{loginvia}{$lonhost}{$item} = $new;
+                    }
+                }
+            } else {
+                if (defined($servers{$env{'form.'.$lonhost.'_server'}})) {
+                    $loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'};
+                    $changes{'loginvia'}{$lonhost} = 1;
+                    foreach my $item (@loginvia_attribs) {
+                        my $new = $env{'form.'.$lonhost.'_'.$item};
+                        if (($item eq 'serverpath') && ($new eq 'custom')) {
+                            if ($env{'form.'.$lonhost.'_custompath'} eq '') {
+                                $new = '/';
+                            }
+                        }
+                        if (($item eq 'custompath') && 
+                            ($env{'form.'.$lonhost.'_serverpath'} ne 'custom')) {
+                            $new = '';
+                        }
+                        $loginhash{login}{loginvia}{$lonhost}{$item} = $new;
+                    }
+                }
+            }
+        }
+    }
+
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
@@ -3339,6 +3714,35 @@ sub modify_login {
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'loginheader') {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>';
+                } elsif ($item eq 'loginvia') {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>';
+                        foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
+                            if (defined($servers{$loginhash{login}{loginvia}{$lonhost}{'server'}})) {
+                                if (ref($loginhash{login}{loginvia}{$lonhost}) eq 'HASH') {
+                                    my $protocol = $Apache::lonnet::protocol{$env{'form.'.$lonhost.'_server'}};
+                                    $protocol = 'http' if ($protocol ne 'https');
+                                    my $target = $protocol.'://'.$servers{$env{'form.'.$lonhost.'_server'}};
+
+                                    if ($loginhash{login}{loginvia}{$lonhost}{'serverpath'} eq 'custom') {
+                                        $target .= $loginhash{login}{loginvia}{$lonhost}{'custompath'};
+                                    } else {
+                                        $target .= $loginhash{login}{loginvia}{$lonhost}{'serverpath'}; 
+                                    }
+                                    $resulttext .= '<li>'.&mt('Server: [_1] log-in page redirects to [_2].',$servers{$lonhost},'<a href="'.$target.'">'.$target.'</a>');
+                                    if ($loginhash{login}{loginvia}{$lonhost}{'exempt'} ne '') {
+                                        $resulttext .= '&nbsp;'.&mt('No redirection for clients from following IPs:').'&nbsp;'.$loginhash{login}{loginvia}{$lonhost}{'exempt'};
+                                    }
+                                    $resulttext .= '</li>';
+                                } else {
+                                    $resulttext .= '<li>'.&mt('Server: [_1] has standard log-in page.',$lonhost).'</li>';
+                                }
+                            } else {
+                                $resulttext .= '<li>'.&mt('Server: [_1] has standard log-in page.',$servers{$lonhost}).'</li>';
+                            }
+                        }
+                        $resulttext .= '</ul></li>';
+                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -3366,6 +3770,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
+            fontmenu => "Font Menu",
             pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
@@ -3423,6 +3828,7 @@ sub modify_colors {
             @logintext = ('textcol','bgcol');
         } else {
             %choices = &color_font_choices();
+            $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
         }
         if ($role eq 'login') {
             @images = ('img','logo','domlogo','login');
@@ -3545,6 +3951,17 @@ sub modify_colors {
                         $changes{$role}{'font'} = 1;
                     }
                 }
+                if ($role ne 'login') {
+                    if ($domconfig->{$role}{'fontmenu'} ne '') {
+                        if ($confhash->{$role}{'fontmenu'} ne $domconfig->{$role}{'fontmenu'}) {
+                            $changes{$role}{'fontmenu'} = 1;
+                        }
+                    } else {
+                        if ($confhash->{$role}{'fontmenu'}) {
+                            $changes{$role}{'fontmenu'} = 1;
+                        }
+                    }
+                }
                 foreach my $item (@bgs) {
                     if ($domconfig->{$role}{$item} ne '') {
                         if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) {
@@ -4040,7 +4457,7 @@ sub modify_quotas {
     }
     foreach my $item (@usertools) {
         foreach my $type (@{$types},'default','_LC_adv') {
-            my $unset;
+            my $unset; 
             if ($context eq 'requestcourses') {
                 $unset = '0';
                 if ($type eq '_LC_adv') {
@@ -4260,7 +4677,8 @@ sub modify_autoenroll {
     }
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
     my %title = ( run => 'Auto-enrollment active',
-                  sender => 'Sender for notification messages');
+                  sender => 'Sender for notification messages',
+                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)');
     my @offon = ('off','on');
     my $sender_uname = $env{'form.sender_uname'};
     my $sender_domain = $env{'form.sender_domain'};
@@ -4269,11 +4687,12 @@ sub modify_autoenroll {
     } elsif ($sender_uname eq '') {
         $sender_domain = '';
     }
+    my $coowners = $env{'form.autoassign_coowners'};
     my %autoenrollhash =  (
-                       autoenroll => { run => $env{'form.autoenroll_run'},
-                                       sender_uname => $sender_uname,
-                                       sender_domain => $sender_domain,
-
+                       autoenroll => { 'run' => $env{'form.autoenroll_run'},
+                                       'sender_uname' => $sender_uname,
+                                       'sender_domain' => $sender_domain,
+                                       'co-owners' => $coowners,
                                 }
                      );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -4294,6 +4713,13 @@ sub modify_autoenroll {
         if ($currautoenroll{'sender_domain'} ne $sender_domain) {
             $changes{'sender'} = 1;
         }
+        if ($currautoenroll{'co-owners'} ne '') {
+            if ($currautoenroll{'co-owners'} ne $coowners) {
+                $changes{'coowners'} = 1;
+            }
+        } elsif ($coowners) {
+            $changes{'coowners'} = 1;
+        }      
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'run'}) {
@@ -4306,6 +4732,10 @@ sub modify_autoenroll {
                     $resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'</li>';
                 }
             }
+            if ($changes{'coowners'}) {
+                $resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>';
+                &Apache::loncommon::devalidate_domconfig_cache($dom);
+            }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to auto-enrollment settings');
@@ -4337,7 +4767,7 @@ sub modify_autoupdate {
                         lastname => 'Last Name',
                         firstname => 'First Name',
                         middlename => 'Middle Name',
-                        gen => 'Generation',
+                        generation => 'Generation',
                       );
     my $othertitle = &mt('All users');
     if (keys(%{$usertypes}) >  0) {
@@ -4345,13 +4775,35 @@ sub modify_autoupdate {
     }
     foreach my $key (keys(%env)) {
         if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) {
-            push(@{$fields{$1}},$2);
+            my ($usertype,$item) = ($1,$2);
+            if (grep(/^\Q$item\E$/,keys(%fieldtitles))) {
+                if ($usertype eq 'default') {   
+                    push(@{$fields{$1}},$2);
+                } elsif (ref($types) eq 'ARRAY') {
+                    if (grep(/^\Q$usertype\E$/,@{$types})) {
+                        push(@{$fields{$1}},$2);
+                    }
+                }
+            }
+        }
+    }
+    my @lockablenames = &Apache::loncommon::get_env_multiple('form.lockablenames');
+    @lockablenames = sort(@lockablenames);
+    if (ref($currautoupdate{'lockablenames'}) eq 'ARRAY') {
+        my @changed = &Apache::loncommon::compare_arrays($currautoupdate{'lockablenames'},\@lockablenames);
+        if (@changed) {
+            $changes{'lockablenames'} = 1;
+        }
+    } else {
+        if (@lockablenames) {
+            $changes{'lockablenames'} = 1;
         }
     }
     my %updatehash = (
                       autoupdate => { run => $env{'form.autoupdate_run'},
                                       classlists => $env{'form.classlists'},
                                       fields => {%fields},
+                                      lockablenames => \@lockablenames,
                                     }
                      );
     foreach my $key (keys(%currautoupdate)) {
@@ -4369,9 +4821,11 @@ sub modify_autoupdate {
                         foreach my $type (@{$currautoupdate{$key}{$item}}) {
                             if (!exists($fields{$item})) {
                                 $change = 1;
+                                last;
                             } elsif (ref($fields{$item}) eq 'ARRAY') {
                                 if (!grep(/^\Q$type\E$/,@{$fields{$item}})) {
                                     $change = 1;
+                                    last;
                                 }
                             }
                         }
@@ -4381,12 +4835,41 @@ sub modify_autoupdate {
                     } 
                 }
             }
+        } elsif ($key eq 'lockablenames') {
+            if (ref($currautoupdate{$key}) eq 'ARRAY') {
+                my @changed = &Apache::loncommon::compare_arrays($currautoupdate{'lockablenames'},\@lockablenames);
+                if (@changed) {
+                    $changes{'lockablenames'} = 1;
+                }
+            } else {
+                if (@lockablenames) {
+                    $changes{'lockablenames'} = 1;
+                }
+            }
+        }
+    }
+    unless (grep(/^\Qlockablenames\E$/,keys(%currautoupdate))) {
+        if (@lockablenames) {
+            $changes{'lockablenames'} = 1;
         }
     }
     foreach my $item (@{$types},'default') {
         if (defined($fields{$item})) {
             if (ref($currautoupdate{'fields'}) eq 'HASH') {
-                if (!exists($currautoupdate{'fields'}{$item})) {
+                if (ref($currautoupdate{'fields'}{$item}) eq 'ARRAY') {
+                    my $change = 0;
+                    if (ref($fields{$item}) eq 'ARRAY') {
+                        foreach my $type (@{$fields{$item}}) {
+                            if (!grep(/^\Q$type\E$/,@{$currautoupdate{'fields'}{$item}})) {
+                                $change = 1;
+                                last;
+                            }
+                        }
+                    }
+                    if ($change) {
+                        push(@{$changes{'fields'}},$item);
+                    }
+                } else {
                     push(@{$changes{'fields'}},$item);
                 }
             } else {
@@ -4400,7 +4883,17 @@ sub modify_autoupdate {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $key (sort(keys(%changes))) {
-                if (ref($changes{$key}) eq 'ARRAY') {
+                if ($key eq 'lockablenames') {
+                    $resulttext .= '<li>';
+                    if (@lockablenames) {
+                        $usertypes->{'default'} = $othertitle;
+                        $resulttext .= &mt("User preference to disable replacement of user's name with institutional data (by auto-update), available for the following affiliations:").' '.
+                                   join(', ', map { $usertypes->{$_}; } @lockablenames).'</li>';
+                    } else {
+                        $resulttext .= &mt("User preference to disable replacement of user's name with institutional data (by auto-update) is unavailable.");
+                    }
+                    $resulttext .= '</li>';
+                } elsif (ref($changes{$key}) eq 'ARRAY') {
                     foreach my $item (@{$changes{$key}}) {
                         my @newvalues;
                         foreach my $type (@{$fields{$item}}) {
@@ -4461,7 +4954,7 @@ sub modify_autocreate {
     my %domcoords = &get_active_dcs($dom);
     unless (exists($domcoords{$newvals{'xmldc'}})) {
         $newvals{'xmldc'} = '';
-    }
+    } 
     %autocreatehash =  (
                         autocreate => { xml => $newvals{'xml'},
                                         req => $newvals{'req'},
@@ -4487,7 +4980,7 @@ sub modify_autocreate {
             }
         }
         if (keys(%changes) > 0) {
-            my @offon = ('off','on');
+            my @offon = ('off','on'); 
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (@types) {
                 if ($changes{$item}) {
@@ -4498,7 +4991,7 @@ sub modify_autocreate {
             if ($changes{'xmldc'}) {
                 my ($dcname,$dcdom) = split(':',$newvals{'xmldc'});
                 my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom);
-                $resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>';
+                $resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>'; 
             }
             $resulttext .= '</ul>';
         } else {
@@ -5409,7 +5902,7 @@ sub modify_scantron {
         my $error;
         if ($configuserok eq 'ok') {
             if ($switchserver) {
-                $error = &mt("Upload of scantron format file is not permitted to this server: [_1]",$switchserver);
+                $error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver);
             } else {
                 if ($author_ok eq 'ok') {
                     my ($result,$scantronurl) =
@@ -5449,25 +5942,25 @@ sub modify_scantron {
                 if (ref($confhash{'scantron'}) eq 'HASH') {
                     $resulttext = &mt('Changes made:').'<ul>';
                     if ($confhash{'scantron'}{'scantronformat'} eq '') {
-                        $resulttext .= '<li>'.&mt('[_1] scantron format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
+                        $resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
                     } else {
-                        $resulttext .= '<li>'.&mt('Custom scantron format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
+                        $resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
                     }
                     $resulttext .= '</ul>';
                 } else {
-                    $resulttext = &mt('Changes made to scantron format file.');
+                    $resulttext = &mt('Changes made to bubblesheet format file.');
                 }
                 $resulttext .= '</ul>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
             } else {
-                $resulttext = &mt('No changes made to scantron format file');
+                $resulttext = &mt('No changes made to bubblesheet format file');
             }
         } else {
             $resulttext = '<span class="LC_error">'.
                 &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext = &mt('No changes made to scantron format file'); 
+        $resulttext = &mt('No changes made to bubblesheet format file'); 
     }
     if ($errors) {
         $resulttext .= &mt('The following errors occurred: ').'<ul>'.
@@ -5825,6 +6318,129 @@ sub modify_serverstatuses {
     return $resulttext;
 }
 
+sub modify_helpsettings {
+    my ($r,$dom,$confname,%domconfig) = @_;
+ 	my ($resulttext,$errors,%changes,%helphash);
+ 	
+ 	my $customhelpfile  = $env{'form.loginhelpurl.filename'};
+    my $defaulthelpfile = 'defaulthelp.html';
+ 	my $servadm = $r->dir_config('lonAdmEMail');
+    my ($configuserok,$author_ok,$switchserver) = 
+        &config_check($dom,$confname,$servadm);
+ 	
+ 	my %defaultchecked = ('submitbugs'	=> 'on');
+ 	my @offon = ('off','on');
+    my %title = ( submitbugs     => 'Display link for users to submit a bug', 
+    			  loginhelpurl  => 'Unauthenticated login help page set to custom file');
+    			  
+    my @toggles = ('submitbugs');
+
+    $helphash{'helpsettings'} = {};
+    
+    if (ref($domconfig{'helpsettings'}) ne 'HASH') {
+        if ($domconfig{'helpsettings'} eq '') {
+            $domconfig{'helpsettings'} = {};
+        }
+    }
+    
+    if (ref($domconfig{'helpsettings'}) eq 'HASH') {
+    	
+        foreach my $item (@toggles) {
+        	
+			if ($defaultchecked{$item} eq 'on') { 
+				if (($domconfig{'helpsettings'}{$item} eq '') &&
+					 ($env{'form.'.$item} eq '0')) {
+					$changes{$item} = 1;
+				} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+					$changes{$item} = 1;
+				}
+			} elsif ($defaultchecked{$item} eq 'off') {
+				if (($domconfig{'helpsettings'}{$item} eq '') &&
+					 ($env{'form.'.$item} eq '1')) {
+					$changes{$item} = 1;
+				} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+					$changes{$item} = 1;
+				}
+			}
+			$helphash{'helpsettings'}{$item} = $env{'form.'.$item};
+		}
+		
+		if ($customhelpfile ne '') {
+			my $error;
+			if ($configuserok eq 'ok') {
+				if ($switchserver) {
+					$error = &mt("Upload of custom help file is not permitted to this server: [_1]",$switchserver);
+				} else {
+					if ($author_ok eq 'ok') {
+						my ($result,$loginhelpurl) =
+							&publishlogo($r,'upload','loginhelpurl',$dom,
+										 $confname,'help','','',$customhelpfile);
+						if ($result eq 'ok') {
+							$helphash{'helpsettings'}{'loginhelpurl'} = $loginhelpurl;
+							$changes{'loginhelpurl'} = 1;
+						} else {
+							$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customhelpfile,$result);
+						}
+					} else {
+						$error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].",$customhelpfile,$confname,$dom,$author_ok);
+					}
+				}
+			} else {
+				$error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$customhelpfile,$confname,$dom,$configuserok);
+			}
+			if ($error) {
+				&Apache::lonnet::logthis($error);
+				$errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+			}
+		}
+		
+        if ($domconfig{'helpsettings'}{'loginhelpurl'} ne '') {
+            if ($env{'form.loginhelpurl_del'}) {
+                $helphash{'helpsettings'}{'loginhelpurl'} = '';
+                $changes{'loginhelpurl'} = 1;
+            }
+        }
+    }
+    
+    
+    my $putresult;
+    
+    if (keys(%changes) > 0) {
+    	$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
+    } else {
+    	$putresult = 'ok';
+    }
+                                             
+    if ($putresult eq 'ok') {
+        if (keys(%changes) > 0) {
+			$resulttext = &mt('Changes made:').'<ul>';
+			foreach my $item (sort(keys(%changes))) {
+				if ($item eq 'submitbugs') {
+					$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
+				}
+				if ($item eq 'loginhelpurl') {
+					if ($helphash{'helpsettings'}{'loginhelpurl'} eq '') {
+                        $resulttext .= '<li>'.&mt('[_1] help file removed; [_2] file will be used for the unathorized help page in this domain.',$customhelpfile,$defaulthelpfile).'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt("$title{$item} [_1]",$customhelpfile).'</li>';
+                    }
+				}
+			}
+			$resulttext .= '</ul>';
+		} else {
+			$resulttext = &mt('No changes made to help settings');
+		}
+    } else {
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    if ($errors) {
+        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
+                       $errors.'</ul>';
+    }
+    return $resulttext;
+}
+
 sub modify_coursedefaults {
     my ($dom,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%defaultshash);
@@ -5931,6 +6547,39 @@ sub recurse_cat_deletes {
     return;
 }
 
+sub dom_servers {
+    my ($dom) = @_;
+    my (%uniqservers,%servers);
+    my $primaryserver = &Apache::lonnet::hostname(&Apache::lonnet::domain($dom,'primary'));
+    my @machinedoms = &Apache::lonnet::machine_domains($primaryserver);
+    foreach my $mdom (@machinedoms) {
+        my %currservers = %servers;
+        my %server = &Apache::lonnet::get_servers($mdom);
+        %servers = (%currservers,%server);
+    }
+    my %by_hostname;
+    foreach my $id (keys(%servers)) {
+        push(@{$by_hostname{$servers{$id}}},$id);
+    }
+    foreach my $hostname (sort(keys(%by_hostname))) {
+        if (@{$by_hostname{$hostname}} > 1) {
+            my $match = 0;
+            foreach my $id (@{$by_hostname{$hostname}}) {
+                if (&Apache::lonnet::host_domain($id) eq $dom) {
+                    $uniqservers{$id} = $hostname;
+                    $match = 1;
+                }
+            }
+            unless ($match) {
+                $uniqservers{$by_hostname{$hostname}[0]} = $hostname;
+            }
+        } else {
+            $uniqservers{$by_hostname{$hostname}[0]} = $hostname;
+        }
+    }
+    return %uniqservers;
+}
+
 sub get_active_dcs {
     my ($dom) = @_;
     my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);
@@ -5953,9 +6602,9 @@ sub get_active_dcs {
 
 sub active_dc_picker {
     my ($dom,$curr_dc) = @_;
-    my %domcoords = &get_active_dcs($dom);
+    my %domcoords = &get_active_dcs($dom); 
     my @dcs = sort(keys(%domcoords));
-    my $numdcs = scalar(@dcs);
+    my $numdcs = scalar(@dcs); 
     my $datatable;
     my $numinrow = 2;
     if ($numdcs > 1) {
@@ -5970,7 +6619,7 @@ sub active_dc_picker {
             }
             my $check = ' ';
             if ($curr_dc eq '') {
-                if (!$i) {
+                if (!$i) { 
                     $check = ' checked="checked" ';
                 }
             } elsif ($dcs[$i] eq $curr_dc) {