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

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

version 1.240, 2015/06/18 21:42:37 version 1.241, 2015/06/18 23:02:48
Line 202  use strict; Line 202  use strict;
 use Apache::lonnet;  use Apache::lonnet;
 use HTML::TokeParser();  use HTML::TokeParser();
 use Apache::lonlocal;  use Apache::lonlocal;
 use MIME::Entity;  use Mail::Send;
 use HTML::Entities;  use HTML::Entities;
 use Encode;  use Encode;
 use LONCAPA qw(:DEFAULT :match);  use LONCAPA qw(:DEFAULT :match);
Line 421  sub unpackmsgid { Line 421  sub unpackmsgid {
   
   
 sub sendemail {  sub sendemail {
     my ($to,$subject,$body,$to_uname,$to_udom,$user_lh,$attachmenturl)=@_;      my ($to,$subject,$body,$to_uname,$to_udom,$user_lh)=@_;
     my $senderaddress='';      my $senderaddress='';
     my $replytoaddress='';      my $replytoaddress='';
     my $msgsent;      my $msgsent;
Line 457  sub sendemail { Line 457  sub sendemail {
     "*** ".($senderaddress?&mt_user($user_lh,'You can reply to this e-mail'):&mt_user($user_lh,'Please do not reply to this address.')."\n*** ".      "*** ".($senderaddress?&mt_user($user_lh,'You can reply to this e-mail'):&mt_user($user_lh,'Please do not reply to this address.')."\n*** ".
     &mt_user($user_lh,'A reply will not be received by the recipient!'))."\n\n".$body;      &mt_user($user_lh,'A reply will not be received by the recipient!'))."\n\n".$body;
           
     $attachmenturl = &Apache::lonnet::filelocation("",$attachmenturl);      my $msg = new Mail::Send;
     my $filesize = (stat($attachmenturl))[7];      $msg->to($to);
     if ($filesize > 1048576) {      $msg->subject('[LON-CAPA] '.$subject);
         print '<p><span class="LC_error">'       if ($replytoaddress) {
             .&mt('Email not sent.  Attachment exceeds permitted length.')          $msg->add('Reply-to',$replytoaddress);
             .'</span><br /></p>';      }
     } else {      if ($senderaddress) {
         my $top = MIME::Entity->build(  Type => "multipart/mixed",          $msg->add('From',$senderaddress);
                                         From => $senderaddress,      }
                                         To => $to,      $msg->add('Content-type','text/plain; charset=UTF-8');
                                         Subject => '[LON-CAPA] '.$subject);      if (my $fh = $msg->open()) {
         $top->attach(Data=>$body);   print $fh $body;
         $top->attach(Path=>$attachmenturl);   $fh->close;
   
         open MAIL, "| /usr/lib/sendmail -t -oi -oem" or die "open: $!";  
         $top->print(\*MAIL);  
         close MAIL;  
         $msgsent = 1;          $msgsent = 1;
     }      }
     return $msgsent;      return $msgsent;
Line 482  sub sendemail { Line 478  sub sendemail {
 # ==================================================== Send notification emails  # ==================================================== Send notification emails
   
 sub sendnotification {  sub sendnotification {
     my ($to,$touname,$toudom,$subj,$crit,$text,$msgid,$attachmenturl)=@_;      my ($to,$touname,$toudom,$subj,$crit,$text,$msgid)=@_;
     my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'};      my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'};
     unless ($sender=~/\w/) {       unless ($sender=~/\w/) { 
  $sender=$env{'user.name'}.':'.$env{'user.domain'};   $sender=$env{'user.name'}.':'.$env{'user.domain'};
Line 566  to access the full message.',$url); Line 562  to access the full message.',$url);
                 }                  }
                 $body = $bodybegin.$bodysubj.$sendtext.$bodyend;                  $body = $bodybegin.$bodysubj.$sendtext.$bodyend;
             }              }
             if (&sendemail($addr,$subject,$body,$touname,$toudom,$user_lh,$attachmenturl)) {              if (&sendemail($addr,$subject,$body,$touname,$toudom,$user_lh)) {
                 $numsent ++;                  $numsent ++;
             }              }
         }          }
Line 577  to access the full message.',$url); Line 573  to access the full message.',$url);
             my $htmlfree = &make_htmlfree($text);              my $htmlfree = &make_htmlfree($text);
             $body = $bodybegin.$bodysubj.$htmlfree.$bodyend;              $body = $bodybegin.$bodysubj.$htmlfree.$bodyend;
         }          }
         if (&sendemail($to,$subject,$body,$touname,$toudom,$user_lh,$attachmenturl)) {          if (&sendemail($to,$subject,$body,$touname,$toudom,$user_lh)) {
             $numsent ++;              $numsent ++;
         }          }
     }      }
Line 746  sub user_crit_msg_raw { Line 742  sub user_crit_msg_raw {
     my $numperm = 0;      my $numperm = 0;
     my $permlogmsgstatus;      my $permlogmsgstatus;
     if ($critnotify) {      if ($critnotify) {
         $numcrit = &sendnotification($critnotify,$user,$domain,$subject,1,$text,$msgid,$attachmenturl);          $numcrit = &sendnotification($critnotify,$user,$domain,$subject,1,$text,$msgid);
     }      }
     if ($toperm && $permemail) {      if ($toperm && $permemail) {
         if ($critnotify && $numcrit) {          if ($critnotify && $numcrit) {
Line 755  sub user_crit_msg_raw { Line 751  sub user_crit_msg_raw {
             }              }
         }          }
         unless ($numperm) {          unless ($numperm) {
             $numperm = &sendnotification($permemail,$user,$domain,$subject,1,$text,$msgid,$attachmenturl);              $numperm = &sendnotification($permemail,$user,$domain,$subject,1,$text,$msgid);
         }          }
     }      }
     if ($toperm) {      if ($toperm) {
Line 890  sub user_normal_msg_raw { Line 886  sub user_normal_msg_raw {
        my $numperm = 0;         my $numperm = 0;
        my $permlogmsgstatus;         my $permlogmsgstatus;
        if ($notify) {         if ($notify) {
            $numnotify = &sendnotification($notify,$user,$domain,$subject,0,$text,$msgid,$attachmenturl);             $numnotify = &sendnotification($notify,$user,$domain,$subject,0,$text,$msgid);
        }         }
        if ($toperm && $permemail) {         if ($toperm && $permemail) {
            if ($notify && $numnotify) {             if ($notify && $numnotify) {
Line 900  sub user_normal_msg_raw { Line 896  sub user_normal_msg_raw {
            }             }
            unless ($numperm) {             unless ($numperm) {
                $numperm = &sendnotification($permemail,$user,$domain,$subject,0,                 $numperm = &sendnotification($permemail,$user,$domain,$subject,0,
                                             $text,$msgid,$attachmenturl);                                              $text,$msgid);
            }             }
        }         }
        if ($toperm) {         if ($toperm) {
Removed from v.1.240  
changed lines
  Added in v.1.241

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