Diff for /loncom/interface/lonmsg.pm between versions 1.240 and 1.242

version 1.240, 2015/06/18 21:42:37 version 1.242, 2015/06/23 02:42:34
Line 200  Returns Line 200  Returns
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::loncommon;
 use HTML::TokeParser();  use HTML::TokeParser();
 use Apache::lonlocal;  use Apache::lonlocal;
 use MIME::Entity;  
 use HTML::Entities;  use HTML::Entities;
 use Encode;  use Encode;
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
Line 460  sub sendemail { Line 460  sub sendemail {
     $attachmenturl = &Apache::lonnet::filelocation("",$attachmenturl);      $attachmenturl = &Apache::lonnet::filelocation("",$attachmenturl);
     my $filesize = (stat($attachmenturl))[7];      my $filesize = (stat($attachmenturl))[7];
     if ($filesize > 1048576) {      if ($filesize > 1048576) {
           # Don't send if it exceeds 1 MB.
         print '<p><span class="LC_error">'           print '<p><span class="LC_error">' 
             .&mt('Email not sent.  Attachment exceeds permitted length.')              .&mt('Email not sent.  Attachment exceeds permitted length.')
             .'</span><br /></p>';              .'</span><br /></p>';
     } else {      } else {
         my $top = MIME::Entity->build(  Type => "multipart/mixed",          # Otherwise build and send the email
                                         From => $senderaddress,          $subject = '[LON-CAPA] '.$subject;
                                         To => $to,          &Apache::loncommon::mime_email($senderaddress, $to, $subject, $body, ,'',
                                         Subject => '[LON-CAPA] '.$subject);                                          '', $attachmenturl, '', '');
         $top->attach(Data=>$body);  
         $top->attach(Path=>$attachmenturl);  
   
         open MAIL, "| /usr/lib/sendmail -t -oi -oem" or die "open: $!";  
         $top->print(\*MAIL);  
         close MAIL;  
         $msgsent = 1;          $msgsent = 1;
     }      }
     return $msgsent;      return $msgsent;

Removed from v.1.240  
changed lines
  Added in v.1.242


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