--- loncom/interface/domainprefs.pm	2021/01/30 22:13:52	1.160.6.107
+++ loncom/interface/domainprefs.pm	2021/02/16 13:48:49	1.160.6.110
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.107 2021/01/30 22:13:52 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.110 2021/02/16 13:48:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -801,7 +801,7 @@ sub print_config_box {
              </tr>'."\n";
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
-            } elsif ($action eq 'contacts') || ($action eq 'passwords')) {
+            } elsif (($action eq 'contacts') || ($action eq 'passwords')) {
                 if ($action eq 'passwords') {
                     $output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal);
                 } else {
@@ -818,12 +818,12 @@ sub print_config_box {
              <tr class="LC_info_row">
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n";
-                 if ($action eq 'passwords') {
-                        $output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal);
-                 } else {
-                        $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
-                 }
-                 $output .= '
+                if ($action eq 'passwords') {
+                    $output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal);
+                } else {
+                    $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+                }
+                $output .= '
             </table>
           </td>
          </tr>
@@ -3097,18 +3097,17 @@ sub print_contacts {
                                                    \%choices,$rownum);
         $datatable .= $reports;
     } elsif ($position eq 'lower') {
-        $css_class = $rownum%2?' class="LC_odd_row"':'';
-        my ($threshold,$sysmail,%excluded,%weights);
+        my (%current,%excluded,%weights);
         my ($defaults,$names) = &Apache::loncommon::lon_status_items();
         if ($lonstatus{'threshold'} =~ /^\d+$/) {
-            $threshold = $lonstatus{'threshold'};
+            $current{'errorthreshold'} = $lonstatus{'threshold'};
         } else {
-            $threshold = $defaults->{'threshold'};
+            $current{'errorthreshold'} = $defaults->{'threshold'};
         }
         if ($lonstatus{'sysmail'} =~ /^\d+$/) {
-            $sysmail = $lonstatus{'sysmail'};
+            $current{'errorsysmail'} = $lonstatus{'sysmail'};
         } else {
-            $sysmail = $defaults->{'sysmail'};
+            $current{'errorsysmail'} = $defaults->{'sysmail'};
         }
         if (ref($lonstatus{'weights'}) eq 'HASH') {
             foreach my $type ('E','W','N','U') {
@@ -3128,13 +3127,16 @@ sub print_contacts {
                 map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}};
             }
         }
-        $datatable .= '<tr'.$css_class.'>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      $titles->{'errorthreshold'}.
-                      '</span></td><td class="LC_left_item">'.
-                      '<input type="text" name="errorthreshold" value="'.
-                      $threshold.'" size="5" /></td></tr>';
-        $rownum ++;
+        foreach my $item ('errorthreshold','errorsysmail') {
+            $css_class = $rownum%2?' class="LC_odd_row"':'';
+            $datatable .= '<tr'.$css_class.'>'.
+                          '<td class="LC_left_item"><span class="LC_nobreak">'.
+                          $titles->{$item}.
+                          '</span></td><td class="LC_left_item">'.
+                          '<input type="text" name="'.$item.'" value="'.
+                          $current{$item}.'" size="5" /></td></tr>';
+            $rownum ++;
+        }
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td class="LC_left_item">'.
@@ -3180,14 +3182,6 @@ sub print_contacts {
         }
         $datatable .= '</tr></table></td></tr>';
         $rownum ++;
-        $css_class = $rownum%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      $titles->{'errorsysmail'}.
-                      '</span></td><td class="LC_left_item">'.
-                      '<input type="text" name="errorsysmail" value="'.
-                      $sysmail.'" size="5" /></td></tr>';
-        $rownum ++;
     } elsif ($position eq 'bottom') {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
         my (@posstypes,%usertypeshash);
@@ -5596,8 +5590,8 @@ sub contact_titles {
                    'updatesmail'     => 'E-mail from nightly check of LON-CAPA module integrity/updates',
                    'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
                    'hostipmail'      => 'E-mail from nightly check of hostname/IP network changes',
-                   'errorthreshold'  => 'Error/warning threshold for status e-mail',
-                   'errorsysmail'    => 'Error threshold for e-mail to core group',
+                   'errorthreshold'  => 'Error count threshold for status e-mail to admin(s)',
+                   'errorsysmail'    => 'Error count threshold for e-mail to developer group',
                    'errorweights'    => 'Weights used to compute error count',
                    'errorexcluded'   => 'Servers with unsent updates excluded from count',
                  );
@@ -11595,7 +11589,7 @@ sub modify_passwords {
                                 $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>';
                             }
                         } else {
-                            $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA usedfor verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>';
+                            $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>';
                         }
                         if ($confighash{'passwords'}{'resetremove'}) {
                             $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form not shown').'</li>';