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

[raeburn]

raeburn		Wed Jul  3 21:16:32 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    Backport 1.411, 1.420 (part), 1.433
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.122 loncom/interface/domainprefs.pm:1.160.6.123
--- loncom/interface/domainprefs.pm:1.160.6.122	Sun Feb 27 02:42:30 2022
+++ loncom/interface/domainprefs.pm	Wed Jul  3 21:16:32 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.122 2022/02/27 02:42:30 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.123 2024/07/03 21:16:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1417,7 +1417,7 @@
             $styleon{$lonhost} = 'display:none';
             $styleoff{$lonhost} = '';
         }
-        if (ref($settings->{'saml'}) eq 'HASH') {
+        if ((ref($settings) eq 'HASH') && (ref($settings->{'saml'}) eq 'HASH')) {
             foreach my $lonhost (keys(%{$settings->{'saml'}})) {
                 if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') {
                     $saml{$lonhost} = 1;
@@ -5523,8 +5523,10 @@
             my $dom_in_effect;
             my $aliasrows = '<tr>'.
                             '<td class="LC_left_item" style="vertical-align: baseline;">'.
-                            &mt('Hostname').': '.
-                            '<i>'.&Apache::lonnet::hostname($server).'</i></td><td> </td>';
+                            &mt('Hostname').': '.
+                            '<span class="LC_nobreak LC_cusr_emph">'.
+                            &Apache::lonnet::hostname($server).
+                            '</span></td><td> </td>';
             if ($othercontrol{$server}) {
                 $dom_in_effect = $othercontrol{$server};
                 my ($current,$forsaml);
@@ -16666,6 +16668,7 @@
                     }
                 }
             }
+            $output .= '</ul>';
         } else {
             $output = '<span class="LC_error">'.
                       &mt('An error occurred: [_1]',$putresult).'</span>';