[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm

[raeburn]

raeburn		Wed Oct 21 14:06:12 2009 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Changes for multi-domain servers.
     - Display hostnames instead of hostIDs (hostIDs still stored internally).
     - Check for equivalence in hostname rather than hostID when excluding current server from redirect targets.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.114 loncom/interface/domainprefs.pm:1.115
--- loncom/interface/domainprefs.pm:1.114	Tue Oct 20 14:29:44 2009
+++ loncom/interface/domainprefs.pm	Wed Oct 21 14:06:11 2009
@@ -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.115 2009/10/21 14:06:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -634,12 +634,12 @@
             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"';