Diff for /loncom/interface/lonnotify.pm between versions 1.18 and 1.19

version 1.18, 2006/05/01 19:37:33 version 1.19, 2006/05/30 12:46:09
Line 34  use Apache::lonlocal; Line 34  use Apache::lonlocal;
 use Mail::Send;  use Mail::Send;
 use HTML::TokeParser;  use HTML::TokeParser;
 use HTML::Entities;  use HTML::Entities;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
   
 sub handler {  sub handler {
     my ($r) = @_;      my ($r) = @_;
Line 624  function goBack(target) { Line 626  function goBack(target) {
         }          }
         foreach my $username (sort(keys(%recipients))) {          foreach my $username (sort(keys(%recipients))) {
             if ($recipients{$username} =~ /\@/) {              if ($recipients{$username} =~ /\@/) {
                 my $value=&Apache::lonnet::escape($username).':'.&Apache::lonnet::escape($recipients{$username});                  my $value=&escape($username).':'.&escape($recipients{$username});
                 $output .= '<tr><td><input type="checkbox" name="recipient" value="'.$value.'" /></td><td>'.$username.'</td><td>&nbsp;&nbsp;</td><td>'.$recipients{$username}.'</td></tr>';                  $output .= '<tr><td><input type="checkbox" name="recipient" value="'.$value.'" /></td><td>'.$username.'</td><td>&nbsp;&nbsp;</td><td>'.$recipients{$username}.'</td></tr>';
             }              }
         }          }
Line 703  ENDSCRIPT Line 705  ENDSCRIPT
                         <td>';                          <td>';
         foreach my $person (@deliveries) {          foreach my $person (@deliveries) {
             my ($username,$email) = split(/:/,$person);              my ($username,$email) = split(/:/,$person);
             $output .= &Apache::lonnet::unescape($email).'&nbsp;('.&Apache::lonnet::unescape($username).')<br />'."\n";              $output .= &unescape($email).'&nbsp;('.&unescape($username).')<br />'."\n";
         }          }
         $output .= '</td>          $output .= '</td>
                    </tr>                     </tr>
Line 729  sub broadcast_email { Line 731  sub broadcast_email {
     foreach my $user (@{$recipients}) {      foreach my $user (@{$recipients}) {
         my $msg = new Mail::Send;          my $msg = new Mail::Send;
         my ($username,$to) = split(/:/,$user);          my ($username,$to) = split(/:/,$user);
         $username = &Apache::lonnet::unescape($username);          $username = &unescape($username);
         $to = &Apache::lonnet::unescape($to);          $to = &unescape($to);
         $msg->to($to);          $msg->to($to);
         $msg->subject($subject);          $msg->subject($subject);
         $msg->add('From',"$from");          $msg->add('From',"$from");

Removed from v.1.18  
changed lines
  Added in v.1.19


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