--- loncom/interface/lonnotify.pm 2005/10/05 18:50:08 1.3 +++ loncom/interface/lonnotify.pm 2005/10/11 21:29:39 1.4 @@ -151,8 +151,6 @@ sub print_display_option_form { 'enddate', $now); my $jscript; - my %totals = (); - my %personnel = (); my $output = <<"ENDONE"; $html @@ -174,14 +172,19 @@ ENDONE ''; $output .= &Apache::lonhtmlcommon::row_closure(); $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Choose sender(s)')); -# FIXME - need to complete work on domain_roles_get -# &Apache::lonnet::domain_roles_get($cdom,\@roles,\%personnel,%totals); + my %personnel = &Apache::lonnet::get_domain_roles($cdom,\@roles); $output .= ''; - if ($totals{'dc'} > 0) { - foreach my $user (sort(keys(%{$personnel{'dc'}}))) { - my ($uname,$udom) = split(/:/,$user); - my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname); - $output .= ' '.$userinfo{firstname}.' '.$userinfo{lastname}.'  ('.$user.')'; + my @domcc = (); + foreach my $server (keys %personnel) { + print STDERR "key level 1 is $server\n"; + foreach my $user (sort(keys %{$personnel{$server}})) { + print STDERR "key level 2 is $user\n"; + my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); + unless (grep/^$uname:$udom$/,@domcc) { + my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname); + $output .= ' '.$userinfo{firstname}.' '.$userinfo{lastname}.'  ('.$uname.':'.$udom.')'; + push (@domcc,$uname.':'.$udom); + } } } $output .= ''; @@ -739,16 +742,15 @@ sub form_elements { sub store_mail { my ($subject,$message,$domain,$recipients,$attachmenturl,$ltext) = @_; - my %status = (); my %servers = (); my $msgid=&packagemail($subject,$message,$domain, $recipients,\%servers,$attachmenturl); # Store in dc email db files on appropriate servers. foreach my $server (keys(%servers)) { -# FIXME This needs to be via a subroutine in lonnet - $status{$server} = &Apache::lonnet::critical( - 'dcmailput:'.$domain.':'.&Apache::lonnet::escape($msgid).'='. - &Apache::lonnet::escape($servers{$server}),$server); + unless (&Apache::lonnet::dcmailput($domain,$msgid,\%servers,$server) eq 'ok') { + &logthis('Storage of dc mail failed for domain'.$domain.' for server: '. + $server.'. Message ID was '.$msgid); + } } }