--- loncom/interface/domainprefs.pm	2009/10/08 22:37:33	1.113
+++ loncom/interface/domainprefs.pm	2009/10/23 16:14:43	1.116
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.113 2009/10/08 22:37:33 raeburn Exp $
+# $Id: domainprefs.pm,v 1.116 2009/10/23 16:14:43 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -634,12 +634,12 @@ sub print_login {
             if ($disallowed{$lonhost} eq '') {
                 $direct = '';
             }
-            $datatable .= '<tr><td>'.$lonhost.'</td>'.
+            $datatable .= '<tr><td>'.$servers{$lonhost}.'</td>'.
                           '<td><select name="'.$lonhost.'_serverurl">'.
                           '<option value=""'.$direct.'>'.$choices{'directlogin'}.
                           '</option>';
             foreach my $hostid (keys(%servers)) {
-                next if ($hostid eq $lonhost);
+                next if ($servers{$hostid} eq $servers{$lonhost});
                 my $selected = '';
                 if ($hostid eq $disallowed{$lonhost}) {
                     $selected = 'selected="selected"';
@@ -657,8 +657,9 @@ sub print_login {
                            'coursecatalog' => 'on',
                            'adminmail'     => 'off',
                            'newuser'       => 'off',
+                           'submitbugs'	   => 'on',
                          );
-    my @toggles = ('coursecatalog','adminmail','newuser');
+    my @toggles = ('coursecatalog','adminmail','newuser','submitbugs');
     my (%checkedon,%checkedoff);
     foreach my $item (@toggles) {
         if ($defaultchecked{$item} eq 'on') { 
@@ -787,9 +788,10 @@ sub print_login {
 sub login_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            coursecatalog => 'Display Course Catalog link?',
+            coursecatalog => 'Display Course/Community Catalog link?',
             adminmail     => "Display Administrator's E-mail Address?",
             disallowlogin => "Login page requests redirected",
+            submitbugs    => "Display &quot;Submit Bug&quot; link?",
             hostid        => "Server",
             serverurl     => "Redirect to log-in via:",
             directlogin   => "No redirect",
@@ -3137,6 +3139,7 @@ sub modify_login {
     my %title = ( coursecatalog => 'Display course catalog',
                   adminmail => 'Display administrator E-mail address',
                   newuser => 'Link for visitors to create a user account',
+                  submitbugs => 'Link for users to submit a bug',
                   loginheader => 'Log-in box header');
     my @offon = ('off','on');
     my %curr_loginvia;
@@ -3150,7 +3153,7 @@ sub modify_login {
     my %loginhash;
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
-    my @toggles = ('coursecatalog','adminmail','newuser');
+    my @toggles = ('coursecatalog','adminmail','newuser','submitbugs');
     foreach my $item (@toggles) {
         $loginhash{login}{$item} = $env{'form.'.$item};
     }
@@ -3180,11 +3183,12 @@ sub modify_login {
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
-        my @toggles = ('coursecatalog','adminmail','newuser');
+        my @toggles = ('coursecatalog','adminmail','newuser','submitbugs');
         my %defaultchecked = (
                     'coursecatalog' => 'on',
                     'adminmail'     => 'off',
                     'newuser'       => 'off',
+                    'submitbugs'	=> 'on',
         );
         if (ref($domconfig{'login'}) eq 'HASH') {
             foreach my $item (@toggles) {