[BACK]Return to lonnotify.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnotify.pm between versions 1.3 and 1.4

version 1.3, 2005/10/05 18:50:08 version 1.4, 2005/10/11 21:29:39
Line 151  sub print_display_option_form { Line 151  sub print_display_option_form {
                                                           'enddate',                                                            'enddate',
                                                           $now);                                                            $now);
     my $jscript;      my $jscript;
     my %totals = ();  
     my %personnel = ();  
     my $output = <<"ENDONE";      my $output = <<"ENDONE";
 $html  $html
 <head>  <head>
Line 174  ENDONE Line 172  ENDONE
                '</td></tr></table></td>';                 '</td></tr></table></td>';
     $output .= &Apache::lonhtmlcommon::row_closure();      $output .= &Apache::lonhtmlcommon::row_closure();
     $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Choose sender(s)'));      $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Choose sender(s)'));
 # FIXME - need to complete work on domain_roles_get      my %personnel = &Apache::lonnet::get_domain_roles($cdom,\@roles);
 #    &Apache::lonnet::domain_roles_get($cdom,\@roles,\%personnel,%totals);  
     $output .= '<td>';      $output .= '<td>';
     if ($totals{'dc'} > 0) {      my @domcc = ();
         foreach my $user (sort(keys(%{$personnel{'dc'}}))) {      foreach my $server (keys %personnel) {
             my ($uname,$udom) = split(/:/,$user);          print STDERR "key level 1 is $server\n"; 
             my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname);          foreach my $user (sort(keys %{$personnel{$server}})) {
             $output .= '<input type="checkbox" name="sender" value="'.$user.'" />&nbsp;'.$userinfo{firstname}.' '.$userinfo{lastname}.'&nbsp;&nbsp;('.$user.')';              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 .= '<input type="checkbox" name="sender" value="'.$uname.':'.$udom.'" />&nbsp;'.$userinfo{firstname}.' '.$userinfo{lastname}.'&nbsp;&nbsp;('.$uname.':'.$udom.')';
                   push (@domcc,$uname.':'.$udom);
               }
         }          }
     }      }
     $output .= '</td>';      $output .= '</td>';
Line 739  sub form_elements { Line 742  sub form_elements {
   
 sub store_mail {  sub store_mail {
     my ($subject,$message,$domain,$recipients,$attachmenturl,$ltext) = @_;      my ($subject,$message,$domain,$recipients,$attachmenturl,$ltext) = @_;
     my %status = ();  
     my %servers = ();      my %servers = ();
     my $msgid=&packagemail($subject,$message,$domain,      my $msgid=&packagemail($subject,$message,$domain,
                            $recipients,\%servers,$attachmenturl);                             $recipients,\%servers,$attachmenturl);
 # Store in dc email db files on appropriate servers.  # Store in dc email db files on appropriate servers.
     foreach my $server (keys(%servers)) {      foreach my $server (keys(%servers)) {
 # FIXME This needs to be via a subroutine in lonnet          unless (&Apache::lonnet::dcmailput($domain,$msgid,\%servers,$server) eq 'ok') {
         $status{$server} = &Apache::lonnet::critical(              &logthis('Storage of dc mail failed for domain'.$domain.' for server: '.
            'dcmailput:'.$domain.':'.&Apache::lonnet::escape($msgid).'='.                        $server.'.  Message ID was '.$msgid);
            &Apache::lonnet::escape($servers{$server}),$server);          }
     }      }
 }  }
   
Removed from v.1.3  
changed lines
  Added in v.1.4

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