Diff for /loncom/interface/domainprefs.pm between versions 1.286 and 1.288

version 1.286, 2017/01/18 21:24:39 version 1.288, 2017/01/23 22:46:44
Line 2958  sub print_contacts { Line 2958  sub print_contacts {
     my @contacts = ('adminemail','supportemail');      my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield,      my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield,
         $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings);          $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings);
     foreach my $type (@mailings) {  
         $otheremails{$type} = '';  
     }  
     if ($position eq 'top') {      if ($position eq 'top') {
         if (ref($settings) eq 'HASH') {          if (ref($settings) eq 'HASH') {
             foreach my $item (@contacts) {              foreach my $item (@contacts) {
Line 2972  sub print_contacts { Line 2969  sub print_contacts {
     } elsif ($position eq 'middle') {      } elsif ($position eq 'middle') {
         @mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',          @mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
                      'updatesmail','idconflictsmail');                       'updatesmail','idconflictsmail');
           foreach my $type (@mailings) {
               $otheremails{$type} = '';
           }
     } else {      } else {
         @mailings = ('helpdeskmail','otherdomsmail');          @mailings = ('helpdeskmail','otherdomsmail');
           foreach my $type (@mailings) {
               $otheremails{$type} = '';
           }
         $bccemails{'helpdeskmail'} = '';          $bccemails{'helpdeskmail'} = '';
         $bccemails{'otherdomsmail'} = '';          $bccemails{'otherdomsmail'} = '';
         $includestr{'helpdeskmail'} = '';          $includestr{'helpdeskmail'} = '';
Line 10650  sub modify_contacts { Line 10653  sub modify_contacts {
             }              }
             $resulttext .= '</ul>';              $resulttext .= '</ul>';
         } else {          } else {
             $resulttext = &mt('No changes made to contact information');              $resulttext = &mt('No changes made to contacts and form settings');
         }          }
     } else {      } else {
         $resulttext = '<span class="LC_error">'.          $resulttext = '<span class="LC_error">'.
Line 14270  sub recurse_cat_deletes { Line 14273  sub recurse_cat_deletes {
   
 sub active_dc_picker {  sub active_dc_picker {
     my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;      my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
     my %domcoords = &get_active_dcs($dom);      my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
     my @domcoord = keys(%domcoords);      my @domcoord = keys(%domcoords);
     if (keys(%currhash)) {      if (keys(%currhash)) {
         foreach my $dc (keys(%currhash)) {          foreach my $dc (keys(%currhash)) {

Removed from v.1.286  
changed lines
  Added in v.1.288


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>