--- loncom/interface/domainprefs.pm	2010/04/14 05:16:47	1.102.2.14
+++ loncom/interface/domainprefs.pm	2009/11/23 21:45:18	1.120
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.102.2.14 2010/04/14 05:16:47 raeburn Exp $
+# $Id: domainprefs.pm,v 1.120 2009/11/23 21:45:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,14 +199,14 @@ sub handler {
     }
     my %domconfig =
       &Apache::lonnet::get_dom('configuration',['login','rolecolors',
-                'quotas','autoenroll','autoupdate','autocreate',
-                'directorysrch','usercreation','usermodification',
-                'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses'],$dom);
+                'quotas','autoenroll','autoupdate','directorysrch',
+                'usercreation','usermodification','contacts','defaults',
+                'scantron','coursecategories','serverstatuses',
+                'requestcourses','helpsettings'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
-                       'autoupdate','autocreate','directorysrch','contacts',
+                       'autoupdate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses');
+                       'requestcourses','coursecategories','serverstatuses','helpsettings');
     my %prefs = (
         'rolecolors' =>
                    { text => 'Default color schemes',
@@ -220,12 +220,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',
@@ -233,7 +234,7 @@ sub handler {
                                   col2 => 'Value'}],
                     },
         'quotas' => 
-                    { text => 'User blogs, personal information pages, portfolios',
+                    { text => 'User blogs, personal information pages and portfolios',
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
@@ -250,16 +251,8 @@ sub handler {
                      help => 'Domain_Configuration_Auto_Updates',
                      header => [{col1 => 'Setting',
                                  col2 => 'Value',},
-                                {col1 => 'Setting',
-                                 col2 => 'Affiliation'},
                                 {col1 => 'User population',
-                                 col2 => 'Updateable user data'}],
-                  },
-        'autocreate' => 
-                  {  text => 'Auto-course creation settings',
-                     help => 'Domain_Configuration_Auto_Creation',
-                     header => [{col1 => 'Configuration Setting',
-                                 col2 => 'Value',}],
+                                 col2 => 'Updataeable user data'}],
                   },
         'directorysrch' => 
                   { text => 'Institutional directory searches',
@@ -326,9 +319,15 @@ sub handler {
                               col3 => 'Specific IPs',
                             }],
                  },
-        'coursedefaults' =>
-                 {text => 'Course/Community defaults',
-                  help => 'Domain_Configuration_Course_Defaults',
+        'helpsettings' =>
+                 {text   => 'Help page settings',
+                  help   => 'Domain_Configuration_Help_Settings',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
+                 },
+        'privacy' => 
+                 {text   => 'User Privacy',
+                  help   => 'Domain_Configuration_User_Privacy',
                   header => [{col1 => 'Setting',
                               col2 => 'Value',}],
                  },
@@ -347,7 +346,7 @@ sub handler {
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
     ({href=>"javascript:changePage(document.$phase,'pickactions')",
-      text=>"Settings to display/modify"});
+      text=>"Pick functionality"});
     my $confname = $dom.'-domainconfig';
     if ($phase eq 'process') {
         &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
@@ -410,8 +409,6 @@ sub process_changes {
         $output = &modify_autoenroll($dom,%domconfig);
     } elsif ($action eq 'autoupdate') {
         $output = &modify_autoupdate($dom,%domconfig);
-    } elsif ($action eq 'autocreate') {
-        $output = &modify_autocreate($dom,%domconfig);
     } elsif ($action eq 'directorysrch') {
         $output = &modify_directorysrch($dom,%domconfig);
     } elsif ($action eq 'usercreation') {
@@ -430,6 +427,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($dom,%domconfig);
     }
     return $output;
 }
@@ -480,6 +479,8 @@ sub print_config_box {
             $colspan = ' colspan="2"';
         } elsif ($action eq 'requestcourses') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings($dom,$settings,\$rowtotal);
         } else {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
         }
@@ -497,18 +498,7 @@ sub print_config_box {
              </tr>';
             $rowtotal ++;
         if ($action eq 'autoupdate') {
-            $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 ++;
+            $output .= &print_autoupdate('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'usercreation') {
             $output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).'
            </table>
@@ -532,7 +522,8 @@ sub print_config_box {
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td></tr>'.
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+
                        &print_usermodification('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
         } elsif ($action eq 'coursecategories') {
@@ -615,8 +606,6 @@ sub print_config_box {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif ($action eq 'autoenroll') {
             $output .= &print_autoenroll($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'autocreate') {
-            $output .= &print_autocreate($dom,$settings,\$rowtotal);
         } elsif ($action eq 'directorysrch') {
             $output .= &print_directorysrch($dom,$settings,\$rowtotal);
         } elsif ($action eq 'contacts') {
@@ -627,7 +616,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 'helpsettings') {
+        	$output .= &print_helpsettings($dom,$settings,\$rowtotal);
+    	}
     }
     $output .= '
    </table>
@@ -641,17 +632,15 @@ sub print_login {
     my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_;
     my ($css_class,$datatable);
     my %choices = &login_choices();
+    my $itemcount = 1;
 
     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>'.
+        $datatable .= '<tr'.$css_class.'><td>'.$choices{'disallowlogin'}.'</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";
+                      '<th>'.$choices{'serverurl'}.'</th></tr>'."\n";
         my %disallowed;
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{'loginvia'}) eq 'HASH') {
@@ -660,52 +649,23 @@ sub print_login {
         }
         foreach my $lonhost (sort(keys(%servers))) {
             my $direct = 'selected="selected"';
-            if (ref($disallowed{$lonhost}) eq 'HASH') {
-                if ($disallowed{$lonhost}{'server'} ne '') {
-                    $direct = '';
-                }
+            if ($disallowed{$lonhost} eq '') {
+                $direct = '';
             }
             $datatable .= '<tr><td>'.$servers{$lonhost}.'</td>'.
-                          '<td><select name="'.$lonhost.'_server">'.
+                          '<td><select name="'.$lonhost.'_serverurl">'.
                           '<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"';
-                    }
+                if ($hostid eq $disallowed{$lonhost}) {
+                    $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 .= '</select></td></tr>';
         }
         $datatable .= '</table></td></tr>';
         return $datatable;
@@ -846,30 +806,27 @@ sub login_choices {
     my %choices =
         &Apache::lonlocal::texthash (
             coursecatalog => 'Display Course/Community Catalog link?',
-            adminmail => "Display Administrator's E-mail Address?",
+            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)",
+            serverurl     => "Redirect to log-in via:",
             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",
+            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;
 }
@@ -887,6 +844,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};
@@ -904,6 +862,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};
@@ -922,6 +884,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;
@@ -950,7 +916,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>';
@@ -964,6 +930,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 ++;
@@ -1319,15 +1301,15 @@ sub print_quotas {
                             $cell{$item} .= '<span class="LC_nobreak"><label>'.
                                   '<input type="radio" name="crsreq_'.$item.
                                   '_'.$type.'" value="'.$val.'"'.$checked.' />'.
-                                  $titles{$option}.'</label>';
+                                  $titles{$option}.'</label>&nbsp;';
                             if ($option eq 'autolimit') {
-                                $cell{$item} .= '&nbsp;<input type="text" name="crsreq_'.
+                                $cell{$item} .= '<input type="text" name="crsreq_'.
                                                 $item.'_limit_'.$type.'" size="1" '.
                                                 'value="'.$currlimit.'" />';
                             }
-                            $cell{$item} .= '</span> ';
+                            $cell{$item} .= '</span>&nbsp; ';
                             if ($option eq 'autolimit') {
-                                $cell{$item} .= $titles{'unlimited'};
+                                $cell{$item} .= $titles{'unlimited'}
                             }
                         }
                     } else {
@@ -1350,7 +1332,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>';
                 }
@@ -1427,13 +1409,13 @@ sub print_quotas {
                                   '_default" value="'.$val.'"'.$checked.' />'.
                                   $titles{$option}.'</label>';
                 if ($option eq 'autolimit') {
-                    $defcell{$item} .= '&nbsp;<input type="text" name="crsreq_'.
+                    $defcell{$item} .= '<input type="text" name="crsreq_'.
                                        $item.'_limit_default" size="1" '.
                                        'value="'.$currlimit.'" />';
                 }
-                $defcell{$item} .= '</span> ';
+                $defcell{$item} .= '</span>&nbsp; ';
                 if ($option eq 'autolimit') {
-                    $defcell{$item} .= $titles{'unlimited'};
+                    $defcell{$item} .= $titles{'unlimited'}
                 }
             }
         } else {
@@ -1456,7 +1438,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>';
     }
@@ -1530,13 +1512,13 @@ sub print_quotas {
                                   '__LC_adv" value="'.$val.'"'.$checked.' />'.
                                   $titles{$option}.'</label>';
                 if ($option eq 'autolimit') {
-                    $advcell{$item} .= '&nbsp;<input type="text" name="crsreq_'.
+                    $advcell{$item} .= '<input type="text" name="crsreq_'.
                                        $item.'_limit__LC_adv" size="1" '.
                                        'value="'.$currlimit.'" />';
                 }
-                $advcell{$item} .= '</span> ';
+                $advcell{$item} .= '</span>&nbsp; ';
                 if ($option eq 'autolimit') {
-                    $advcell{$item} .= $titles{'unlimited'};
+                    $advcell{$item} .= $titles{'unlimited'}
                 }
             }
         } else {
@@ -1559,7 +1541,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>';
     }
@@ -1649,7 +1631,7 @@ sub print_courserequestmail {
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($defdom,$runon,$runoff,$coownerson,$coownersoff);
+    my ($defdom,$runon,$runoff);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -1668,18 +1650,6 @@ 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'};
         }
@@ -1710,16 +1680,8 @@ 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>'.
-                  '<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;
+                  ':&nbsp;'.$domform.'</span></td></tr>';
+    $$rowtotal += 2;
     return $datatable;
 }
 
@@ -1761,17 +1723,9 @@ 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','generation',
+        my @fields = ('lastname','firstname','middlename','gen',
                       'permanentemail','id');
         my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
         my $numrows = 0;
@@ -1792,57 +1746,6 @@ sub print_autoupdate {
     return $datatable;
 }
 
-sub print_autocreate {
-    my ($dom,$settings,$rowtotal) = @_;
-    my (%createon,%createoff);
-    my $curr_dc;
-    my @types = ('xml','req');
-    if (ref($settings) eq 'HASH') {
-        foreach my $item (@types) {
-            $createoff{$item} = ' checked="checked" ';
-            $createon{$item} = ' ';
-            if (exists($settings->{$item})) {
-                if ($settings->{$item}) {
-                    $createon{$item} = ' checked="checked" ';
-                    $createoff{$item} = ' ';
-                }
-            }
-        }
-        $curr_dc = $settings->{'xmldc'};
-    } else {
-        foreach my $item (@types) {
-            $createoff{$item} = ' checked="checked" ';
-            $createon{$item} = ' ';
-        }
-    }
-    $$rowtotal += 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>'.
-                  '<input type="radio" name="autocreate_xml"'.
-                  $createon{'xml'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="autocreate_xml"'.
-                  $createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>';
-    my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc);
-    if ($numdc > 1) {
-        $datatable .= '</td><tr><td>'.
-                      &mt('XML files processed as: (choose Dom. Coord.)').
-                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>'.
-                      '<tr class="LC_odd_row">';
-        $$rowtotal ++ ;
-    } else {
-        $datatable .= '</td></tr><tr>';
-    }
-    $datatable .= '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="autocreate_req"'.
-                  $createon{'req'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="autocreate_req"'.
-                  $createoff{'req'}.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
-    return $datatable;
-}
-
 sub print_directorysrch {
     my ($dom,$settings,$rowtotal) = @_;
     my $srchon = ' ';
@@ -1960,13 +1863,12 @@ sub print_contacts {
     my ($dom,$settings,$rowtotal) = @_;
     my $datatable;
     my @contacts = ('adminemail','supportemail');
-    my (%checked,%to,%otheremails,%bccemails);
+    my (%checked,%to,%otheremails);
     my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
                     'requestsmail');
     foreach my $type (@mailings) {
         $otheremails{$type} = '';
     }
-    $bccemails{'helpdeskmail'} = '';
     if (ref($settings) eq 'HASH') {
         foreach my $item (@contacts) {
             if (exists($settings->{$item})) {
@@ -1982,9 +1884,6 @@ sub print_contacts {
                         }
                     }
                     $otheremails{$type} = $settings->{$type}{'others'};
-                    if ($type eq 'helpdeskmail') {
-                        $bccemails{$type} = $settings->{$type}{'bcc'};
-                    }
                 }
             } elsif ($type eq 'lonstatusmail') {
                 $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
@@ -2028,36 +1927,41 @@ sub print_contacts {
         }
         $datatable .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
                       '<input type="text" name="'.$type.'_others" '.
-                      'value="'.$otheremails{$type}.'"  />';
-        if ($type eq 'helpdeskmail') {
-            $datatable .= '<br />'.&mt('Bcc').':'.('&nbsp;'x6).
-                          '<input type="text" name="'.$type.'_bcc" '.
-                          'value="'.$bccemails{$type}.'"  />';
-        }
-        $datatable .= '</td></tr>'."\n";
+                      'value="'.$otheremails{$type}.'"  />'.
+                      '</td></tr>'."\n";
     }
     $$rowtotal += $rownum;
     return $datatable;
 }
 
-sub radiobutton_prefs {
-    my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_;
-    return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
-                   (ref($choices) eq 'HASH'));
+sub print_helpsettings {
 
-    my (%checkedon,%checkedoff,$datatable,$css_class);
-
-    foreach my $item (@{$toggles}) {
-        if ($defaultchecked->{$item} eq 'on') {
+	my ($dom,$settings,$rowtotal) = @_;
+	my ($css_class,$datatable);
+	my $itemcount = 1;
+	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') {
+        } elsif ($defaultchecked{$item} eq 'off') {
             $checkedoff{$item} = ' checked="checked" ';
             $checkedon{$item} = ' ';
         }
     }
+    
     if (ref($settings) eq 'HASH') {
-        foreach my $item (@{$toggles}) {
+        foreach my $item (@toggles) {
             if ($settings->{$item} eq '1') {
                 $checkedon{$item} =  ' checked="checked" ';
                 $checkedoff{$item} = ' ';
@@ -2066,11 +1970,12 @@ sub radiobutton_prefs {
                 $checkedon{$item} = ' ';
             }
         }
-    }
-    foreach my $item (@{$toggles}) {
+     }
+    
+     foreach my $item (@toggles) {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .=
-            '<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices->{$item}.
+        $datatable .=  
+            '<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="'.
@@ -2080,25 +1985,9 @@ sub radiobutton_prefs {
             '</span></td>'.
             '</tr>';
         $itemcount ++;
-    }
-    return ($datatable,$itemcount);
-}
-
-sub print_coursedefaults {
-    my ($dom,$settings,$rowtotal) = @_;
-    my ($css_class,$datatable);
-    my $itemcount = 1;
-    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',);
-    ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                 \%choices,$itemcount);
-    $$rowtotal += $itemcount;
-    return $datatable;
+     }
+     return $datatable;
+	
 }
 
 sub contact_titles {
@@ -2146,7 +2035,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;
@@ -2642,7 +2531,7 @@ sub print_scantronformat {
                       '<span class="LC_nobreak">';
         if ($scantronurl) {
             $datatable .= '<a href="'.$scantronurl.'" target="_blank">'.
-                          &mt('Default bubblesheet format file').'</a>';
+                          &mt('Default scantron format file').'</a>';
         } else {
             $datatable = &mt('File unavailable for display');
         }
@@ -2669,7 +2558,7 @@ sub print_scantronformat {
         } elsif ($scantronurl) {
             $datatable .= '<td><span class="LC_nobreak">'.
                           '<a href="'.$scantronurl.'" target="_blank">'.
-                          &mt('Custom bubblesheet format file').'</a><label>'.
+                          &mt('Custom scantron format file').'</a><label>'.
                           '<input type="checkbox" name="scantronformat_del"'.
                           '" value="1" />'.&mt('Delete?').'</label></span></td>'.
                           '<td><span class="LC_nobreak">&nbsp;'.
@@ -2698,7 +2587,7 @@ sub legacy_scantronformat {
             &publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron',
                          '','',$newfile);
         if ($result ne 'ok') {
-            $error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result);
+            $error = &mt("An error occurred publishing the [_1] scantron format file in RES space. Error was: [_2].",$newfile,$result);
         }
     }
     return ($url,$error);
@@ -2742,8 +2631,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">'.
@@ -2802,9 +2691,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 ++;
                     }
@@ -2898,7 +2787,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>'
@@ -2997,7 +2886,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[
@@ -3278,7 +3167,6 @@ 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') {
@@ -3315,12 +3203,10 @@ 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 {
@@ -3444,86 +3330,19 @@ sub modify_login {
     }
 
     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;
-                    }
-                }
+            next if ($env{'form.'.$lonhost.'_serverurl'} eq $lonhost);
+            if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost}) {
+                $loginhash{login}{loginvia}{$lonhost} = $curr_loginvia{$lonhost};                next;
+            }
+            if ($curr_loginvia{$lonhost} ne '') {
+                $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'};
+                $changes{'loginvia'}{$lonhost} = 1;
             } else {
-                if (defined($servers{$env{'form.'.$lonhost.'_server'}})) {
-                    $loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'};
+                if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) {
+                    $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'};
                     $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;
-                    }
                 }
             }
         }
@@ -3579,30 +3398,13 @@ sub modify_login {
                     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>';
-                                }
+                            if ($servers{$env{'form.'.$lonhost.'_serverurl'}} ne '') {
+                                $resulttext .= '<li>'.&mt('Server: [_1] log-in page now redirects to [_2]',$lonhost,$servers{$env{'form.'.$lonhost.'_serverurl'}}).'</li>';
                             } else {
-                                $resulttext .= '<li>'.&mt('Server: [_1] has standard log-in page.',$servers{$lonhost}).'</li>';
+                                $resulttext .= '<li>'.&mt('Server: [_1] now has standard log-in page.',$lonhost).'</li>';
                             }
                         }
-                        $resulttext .= '</ul></li>';
+                        $resulttext .= '</ul></li>'; 
                     }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
@@ -3631,6 +3433,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
+            fontmenu => "Font Menu",
             pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
@@ -3688,6 +3491,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');
@@ -3810,6 +3614,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}) {
@@ -4305,7 +4120,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') {
@@ -4525,8 +4340,7 @@ sub modify_autoenroll {
     }
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
     my %title = ( run => 'Auto-enrollment active',
-                  sender => 'Sender for notification messages',
-                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)');
+                  sender => 'Sender for notification messages');
     my @offon = ('off','on');
     my $sender_uname = $env{'form.sender_uname'};
     my $sender_domain = $env{'form.sender_domain'};
@@ -4535,12 +4349,11 @@ 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,
-                                       'co-owners' => $coowners,
+
                                 }
                      );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -4561,13 +4374,6 @@ 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'}) {
@@ -4580,10 +4386,6 @@ 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');
@@ -4615,7 +4417,7 @@ sub modify_autoupdate {
                         lastname => 'Last Name',
                         firstname => 'First Name',
                         middlename => 'Middle Name',
-                        generation => 'Generation',
+                        gen => 'Generation',
                       );
     my $othertitle = &mt('All users');
     if (keys(%{$usertypes}) >  0) {
@@ -4623,35 +4425,13 @@ sub modify_autoupdate {
     }
     foreach my $key (keys(%env)) {
         if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) {
-            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;
+            push(@{$fields{$1}},$2);
         }
     }
     my %updatehash = (
                       autoupdate => { run => $env{'form.autoupdate_run'},
                                       classlists => $env{'form.classlists'},
                                       fields => {%fields},
-                                      lockablenames => \@lockablenames,
                                     }
                      );
     foreach my $key (keys(%currautoupdate)) {
@@ -4669,11 +4449,9 @@ 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;
                                 }
                             }
                         }
@@ -4683,41 +4461,12 @@ 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 (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 {
+                if (!exists($currautoupdate{'fields'}{$item})) {
                     push(@{$changes{'fields'}},$item);
                 }
             } else {
@@ -4731,17 +4480,7 @@ sub modify_autoupdate {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $key (sort(keys(%changes))) {
-                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') {
+                if (ref($changes{$key}) eq 'ARRAY') {
                     foreach my $item (@{$changes{$key}}) {
                         my @newvalues;
                         foreach my $type (@{$fields{$item}}) {
@@ -4780,78 +4519,6 @@ sub modify_autoupdate {
     return $resulttext;
 }
 
-sub modify_autocreate {
-    my ($dom,%domconfig) = @_;
-    my ($resulttext,%changes,%currautocreate,%newvals,%autocreatehash);
-    if (ref($domconfig{'autocreate'}) eq 'HASH') {
-        foreach my $key (keys(%{$domconfig{'autocreate'}})) {
-            $currautocreate{$key} = $domconfig{'autocreate'}{$key};
-        }
-    }
-    my %title= ( xml => 'Auto-creation of courses in XML course description files',
-                 req => 'Auto-creation of validated requests for official courses',
-                 xmldc => 'Identity of course creator of courses from XML files',
-               );
-    my @types = ('xml','req');
-    foreach my $item (@types) {
-        $newvals{$item} = $env{'form.autocreate_'.$item};
-        $newvals{$item} =~ s/\D//g;
-        $newvals{$item} = 0 if ($newvals{$item} eq '');
-    }
-    $newvals{'xmldc'} = $env{'form.autocreate_xmldc'};
-    my %domcoords = &get_active_dcs($dom);
-    unless (exists($domcoords{$newvals{'xmldc'}})) {
-        $newvals{'xmldc'} = '';
-    }
-    %autocreatehash =  (
-                        autocreate => { xml => $newvals{'xml'},
-                                        req => $newvals{'req'},
-                                      }
-                       );
-    if ($newvals{'xmldc'} ne '') {
-        $autocreatehash{'autocreate'}{'xmldc'} = $newvals{'xmldc'};
-    }
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%autocreatehash,
-                                             $dom);
-    if ($putresult eq 'ok') {
-        my @items = @types;
-        if ($newvals{'xml'}) {
-            push(@items,'xmldc');
-        }
-        foreach my $item (@items) {
-            if (exists($currautocreate{$item})) {
-                if ($currautocreate{$item} ne $newvals{$item}) {
-                    $changes{$item} = 1;
-                }
-            } elsif ($newvals{$item}) {
-                $changes{$item} = 1;
-            }
-        }
-        if (keys(%changes) > 0) {
-            my @offon = ('off','on');
-            $resulttext = &mt('Changes made:').'<ul>';
-            foreach my $item (@types) {
-                if ($changes{$item}) {
-                    my $newtxt = $offon[$newvals{$item}];
-                    $resulttext .= '<li>'.&mt("$title{$item} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>';
-                }
-            }
-            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 .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made to auto-creation settings');
-        }
-    } else {
-        $resulttext = '<span class="LC_error">'.
-            &mt('An error occurred: [_1]',$putresult).'</span>';
-    }
-    return $resulttext;
-}
-
 sub modify_directorysrch {
     my ($dom,%domconfig) = @_;
     my ($resulttext,%changes);
@@ -5034,7 +4701,7 @@ sub modify_contacts {
             $currsetting{$key} = $domconfig{'contacts'}{$key};
         }
     }
-    my (%others,%to,%bcc);
+    my (%others,%to);
     my @contacts = ('supportemail','adminemail');
     my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
                     'requestsmail');
@@ -5050,10 +4717,6 @@ sub modify_contacts {
         }  
         $others{$type} = $env{'form.'.$type.'_others'};
         $contacts_hash{contacts}{$type}{'others'} = $others{$type};
-        if ($type eq 'helpdeskmail') {
-            $bcc{$type} = $env{'form.'.$type.'_bcc'};
-            $contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type};
-        }
     }
     foreach my $item (@contacts) {
         $to{$item} = $env{'form.'.$item};
@@ -5078,11 +4741,6 @@ sub modify_contacts {
             if ($others{$type} ne $currsetting{$type}{'others'}) {
                 push(@{$changes{$type}},'others');
             }
-            if ($type eq 'helpdeskmail') {
-                if ($bcc{$type} ne $currsetting{$type}{'bcc'}) {
-                    push(@{$changes{$type}},'bcc');
-                }
-            }
         }
     } else {
         my %default;
@@ -5105,12 +4763,7 @@ sub modify_contacts {
             }
             if ($others{$type} ne '') {
                 push(@{$changes{$type}},'others');
-            }
-            if ($type eq 'helpdeskmail') {
-                if ($bcc{$type} ne '') {
-                    push(@{$changes{$type}},'bcc');
-                }
-            }
+            } 
         }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash,
@@ -5138,13 +4791,7 @@ sub modify_contacts {
                         push(@text,$others{$type});
                     }
                     $resulttext .= '<span class="LC_cusr_emph">'.
-                                   join(', ',@text).'</span>';
-                    if ($type eq 'helpdeskmail') {
-                        if ($bcc{$type} ne '') {
-                            $resulttext .= '&nbsp;'.&mt('with Bcc to').': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>';
-                        }
-                    }
-                    $resulttext .= '</li>';
+                                   join(', ',@text).'</span></li>';
                 }
             }
             $resulttext .= '</ul>';
@@ -5626,7 +5273,7 @@ sub modify_usermodification {
                             }
                             my @modifiable;
                             if ($context eq 'selfcreate') {
-                                $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Self-creation of account by users with status: [_1]',$rolename).'</span> - '.&mt('modifiable fields (if institutional data blank): ');
+                                $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Self-creation of account by users with status: [_1]  ',$rolename).'</span> - '.&mt('modifiable fields (if institutional data blank): ');
                             } else {
                                 $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: ');
                             }
@@ -5770,7 +5417,7 @@ sub modify_scantron {
         my $error;
         if ($configuserok eq 'ok') {
             if ($switchserver) {
-                $error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver);
+                $error = &mt("Upload of scantron format file is not permitted to this server: [_1]",$switchserver);
             } else {
                 if ($author_ok eq 'ok') {
                     my ($result,$scantronurl) =
@@ -5810,25 +5457,25 @@ sub modify_scantron {
                 if (ref($confhash{'scantron'}) eq 'HASH') {
                     $resulttext = &mt('Changes made:').'<ul>';
                     if ($confhash{'scantron'}{'scantronformat'} eq '') {
-                        $resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
+                        $resulttext .= '<li>'.&mt('[_1] scantron format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
                     } else {
-                        $resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
+                        $resulttext .= '<li>'.&mt('Custom scantron format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
                     }
                     $resulttext .= '</ul>';
                 } else {
-                    $resulttext = &mt('Changes made to bubblesheet format file.');
+                    $resulttext = &mt('Changes made to scantron format file.');
                 }
                 $resulttext .= '</ul>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
             } else {
-                $resulttext = &mt('No changes made to bubblesheet format file');
+                $resulttext = &mt('No changes made to scantron format file');
             }
         } else {
             $resulttext = '<span class="LC_error">'.
                 &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext = &mt('No changes made to bubblesheet format file'); 
+        $resulttext = &mt('No changes made to scantron format file'); 
     }
     if ($errors) {
         $resulttext .= &mt('The following errors occurred: ').'<ul>'.
@@ -5863,13 +5510,15 @@ sub modify_coursecategories {
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
-        $changes{'togglecatscomm'} = 1;
-        $changes{'categorizecomm'} = 1;
         $domconfig{'coursecategories'} = {
                                              togglecats => $env{'form.togglecats'},
                                              categorize => $env{'form.categorize'},
-                                             togglecatscomm => $env{'form.togglecatscomm'},
-                                             categorizecomm => $env{'form.categorizecomm'},
+                                         };
+        $changes{'togglecatscomm'} = 1;
+        $changes{'categorizecomm'} = 1;
+        $domconfig{'coursecategories'} = {
+                                             togglecats => $env{'form.togglecatscomm'},
+                                             categorize => $env{'form.categorizecomm'},
                                          };
     }
     if (ref($cathash) eq 'HASH') {
@@ -6186,68 +5835,68 @@ sub modify_serverstatuses {
     return $resulttext;
 }
 
-sub modify_coursedefaults {
+sub modify_helpsettings {
     my ($dom,%domconfig) = @_;
-    my ($resulttext,$errors,%changes,%defaultshash);
-    my %defaultchecked = ('canuse_pdfforms' => 'off');
-    my @offon = ('off','on');
-    my @toggles = ('canuse_pdfforms');
-
-    $defaultshash{'coursedefaults'} = {};
-
-    if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
-        if ($domconfig{'coursedefaults'} eq '') {
-            $domconfig{'coursedefaults'} = {};
-        }
-    }
-
-    if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+ 	my ($resulttext,$errors,%changes,%helphash);
+ 	
+ 	my %defaultchecked = ('submitbugs'	=> 'on');
+ 	my @offon = ('off','on');
+    my %title = ( submitbugs => 'Display link for users to submit a bug');
+    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{'coursedefaults'}{$item} eq '') &&
-                    ($env{'form.'.$item} eq '0')) {
-                    $changes{$item} = 1;
-                } elsif ($domconfig{'coursdefaults'}{$item} ne $env{'form.'.$item}) {
-                    $changes{$item} = 1;
-                }
-            } elsif ($defaultchecked{$item} eq 'off') {
-                if (($domconfig{'coursedefaults'}{$item} eq '') &&
-                    ($env{'form.'.$item} eq '1')) {
-                    $changes{$item} = 1;
-                } elsif ($domconfig{'coursedefaults'}{$item} ne $env{'form.'.$item}) {
-                    $changes{$item} = 1;
-                }
-            }
-            $defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item};
-        }
+        	
+			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};
+		}  
     }
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
+    
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%helphash,
                                              $dom);
+                                             
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
-            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);
-            }
-            $resulttext = &mt('Changes made:').'<ul>';
-            foreach my $item (sort(keys(%changes))) {
-                if ($item eq 'canuse_pdfforms') {
-                    if ($env{'form.'.$item} eq '1') {
-                        $resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>';
-                    }
-                }
-            }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made to course defaults');
-        }
+			$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>';
+				}
+			}
+			$resulttext .= '</ul>';
+		} else {
+			$resulttext = &mt('No changes made to help settings');
+		}
     } else {
         $resulttext = '<span class="LC_error">'.
-            &mt('An error occurred: [_1]',$putresult).'</span>';
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    if ($errors) {
+        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
+                       $errors.'</ul>';
     }
     return $resulttext;
 }
@@ -6325,74 +5974,4 @@ sub dom_servers {
     return %uniqservers;
 }
 
-sub get_active_dcs {
-    my ($dom) = @_;
-    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);
-            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,$curr_dc) = @_;
-    my %domcoords = &get_active_dcs($dom);
-    my @dcs = sort(keys(%domcoords));
-    my $numdcs = scalar(@dcs);
-    my $datatable;
-    my $numinrow = 2;
-    if ($numdcs > 1) {
-        $datatable = '<table>';
-        for (my $i=0; $i<@dcs; $i++) {
-            my $rem = $i%($numinrow);
-            if ($rem == 0) {
-                if ($i > 0) {
-                    $datatable .= '</tr>';
-                }
-                $datatable .= '<tr>';
-            }
-            my $check = ' ';
-            if ($curr_dc eq '') {
-                if (!$i) {
-                    $check = ' checked="checked" ';
-                }
-            } elsif ($dcs[$i] eq $curr_dc) {
-                $check = ' checked="checked" ';
-            }
-            if ($i == @dcs - 1) {
-                my $colsleft = $numinrow - $rem;
-                if ($colsleft > 1) {
-                    $datatable .= '<td colspan="'.$colsleft.'">';
-                } else {
-                    $datatable .= '<td>';
-                }
-            } else {
-                $datatable .= '<td>';
-            }
-            my ($dcname,$dcdom) = split(':',$dcs[$i]);
-            $datatable .= '<span class="LC_nobreak"><label>'.
-                          '<input type="radio" name="autocreate_xmldc"'.
-                          ' value="'.$dcs[$i].'"'.$check.'/>'.
-                          &Apache::loncommon::plainname($dcname,$dcdom).
-                          '</label></span></td>';
-        }
-        $datatable .= '</tr></table>';
-    } elsif (@dcs) {
-        $datatable .= '<input type="hidden" name="autocreate_dc" value="'.
-                      $dcs[0].'" />';
-    }
-    return ($numdcs,$datatable);
-}
-
 1;