--- loncom/interface/domainprefs.pm 2008/12/26 21:48:43 1.83 +++ loncom/interface/domainprefs.pm 2008/12/26 22:24:43 1.84 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.83 2008/12/26 21:48:43 raeburn Exp $ +# $Id: domainprefs.pm,v 1.84 2008/12/26 22:24:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1330,7 +1330,7 @@ sub print_quotas { '  '; } $datatable .= '('.&mt('overrides affiliation'). - ')'; + ')'; $$rowtotal += $typecount; return $datatable; } @@ -4980,11 +4980,15 @@ sub modify_serverstatuses { my %changes; foreach my $type (@pages) { foreach my $setting ('namedusers','machines') { - my @current = (); + my (@current,@new); if (ref($currserverstatus{$type}) eq 'HASH') { - @current = split(/,/,$currserverstatus{$type}{$setting}); + if ($currserverstatus{$type}{$setting} ne '') { + @current = split(/,/,$currserverstatus{$type}{$setting}); + } + } + if ($newserverstatus{$type}{$setting} ne '') { + @new = split(/,/,$newserverstatus{$type}{$setting}); } - my @new = split(/,/,$newserverstatus{$type}{$setting}); if (@current > 0) { if (@new > 0) { foreach my $item (@current) { @@ -4993,12 +4997,10 @@ sub modify_serverstatuses { last; } } - if (!$changes{$type}{$setting}) { - foreach my $item (@new) { - if (!grep(/^\Q$item\E$/,@current)) { - $changes{$type}{$setting} = 1; - last; - } + foreach my $item (@new) { + if (!grep(/^\Q$item\E$/,@current)) { + $changes{$type}{$setting} = 1; + last; } } } else { @@ -5016,15 +5018,16 @@ sub modify_serverstatuses { if ($putresult eq 'ok') { $resulttext .= &mt('Changes made:').'