--- loncom/interface/domainprefs.pm	2009/10/20 14:29:44	1.114
+++ loncom/interface/domainprefs.pm	2009/10/25 15:53:25	1.117
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.114 2009/10/20 14:29:44 jms Exp $
+# $Id: domainprefs.pm,v 1.117 2009/10/25 15:53:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -320,7 +320,7 @@ sub handler {
                             }],
                  },
     );
-    my %servers = &Apache::lonnet::get_servers($dom);
+    my %servers = &dom_servers($dom);
     if (keys(%servers) > 1) {
         $prefs{'login'}  = { text   => 'Log-in page options',
                              help   => 'Domain_Configuration_Login_Page',
@@ -617,7 +617,7 @@ sub print_login {
     my $itemcount = 1;
 
     if ($position eq 'top') {
-        my %servers = &Apache::lonnet::get_servers($dom);
+        my %servers = &dom_servers($dom);
         my $choice = $choices{'disallowlogin'};
         $css_class = ' class="LC_odd_row"';
         $datatable .= '<tr'.$css_class.'><td>'.$choices{'disallowlogin'}.'</td>'.
@@ -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"';
@@ -788,7 +788,7 @@ 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?",
@@ -3163,7 +3163,7 @@ sub modify_login {
                                          \%loginhash);
     }
 
-    my %servers = &Apache::lonnet::get_servers($dom);
+    my %servers = &dom_servers($dom);
     if (keys(%servers) > 1) {
         foreach my $lonhost (keys(%servers)) {
             next if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost});
@@ -5666,4 +5666,37 @@ 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;
+}
+
 1;