--- loncom/interface/lonmsg.pm 2016/08/04 22:53:55 1.239.2.1
+++ loncom/interface/lonmsg.pm 2024/02/08 03:02:12 1.251
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.239.2.1 2016/08/04 22:53:55 raeburn Exp $
+# $Id: lonmsg.pm,v 1.251 2024/02/08 03:02:12 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -120,7 +120,7 @@ Critical message to a user
New routine that respects "forward" and calls old routine
-=item * B<user_crit_msg($user, $domain, $subject, $message, $sendback, $nosentstore, $recipid, $attachmenturl, $permresults)>:
+=item * B<user_crit_msg($user, $domain, $subject, $message, $sendback, $toperm, $sentmessage, $nosentstore, $recipid, $attachmenturl, $permresults, $senthide)>:
Sends a critical message $message to the $user at $domain. If $sendback
is true, a receipt will be sent to the current user when $user receives
the message.
@@ -148,7 +148,7 @@ New routine that respects "forward" and
=item * B<user_normal_msg($user, $domain, $subject, $message, $citation,
$baseurl, $attachmenturl, $toperm, $sentmessage, $symb, $restitle,
- $error,$nosentstore,$recipid,$permresults)>:
+ $error,$nosentstore,$recipid,$permresults,$senthide)>:
Sends a message to the $user at $domain, with subject $subject and message $message.
Additionally it will check if the user has a Forwarding address
@@ -200,9 +200,9 @@ Returns
use strict;
use Apache::lonnet;
+use Apache::loncommon;
use HTML::TokeParser();
use Apache::lonlocal;
-use Mail::Send;
use HTML::Entities;
use Encode;
use LONCAPA qw(:DEFAULT :match);
@@ -218,8 +218,8 @@ use LONCAPA qw(:DEFAULT :match);
sub packagemsg {
- my ($subject,$message,$citation,$baseurl,$attachmenturl,
- $recuser,$recdomain,$msgid,$type,$crsmsgid,$symb,$error,$recipid)=@_;
+ my ($subject,$message,$citation,$baseurl,$attachmenturl,$recuser,$recdomain,
+ $msgid,$type,$crsmsgid,$symb,$error,$recipid,$senthide,$origmsgid)=@_;
$message =&HTML::Entities::encode($message,'<>&"');
$citation=&HTML::Entities::encode($citation,'<>&"');
$subject =&HTML::Entities::encode($subject,'<>&"');
@@ -229,8 +229,25 @@ sub packagemsg {
#remove machine specification
$attachmenturl =~ s|^https?://[^/]+/|/|;
$attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
+ if ($senthide) {
+ foreach my $item ($subject,$message) {
+ if ($item ne '') {
+ $item = 'Not shown due to IP block';
+ }
+ }
+ if ($attachmenturl ne '') {
+ $attachmenturl = '';
+ }
+ if ($citation ne '') {
+ $citation = '';
+ }
+ if ($msgid ne '') {
+ $msgid = '';
+ }
+ }
my $course_context = &get_course_context();
my $now=time;
+ my $ip = &Apache::lonnet::get_requestor_ip();
my $msgcount = &get_uniq();
unless(defined($msgid)) {
$msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'},
@@ -250,7 +267,7 @@ sub packagemsg {
}
$result .= '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
'<host>'.$ENV{'HTTP_HOST'}.'</host>'.
- '<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.
+ '<client>'.$ip.'</client>'.
'<browsertype>'.$env{'browser.type'}.'</browsertype>'.
'<browseros>'.$env{'browser.os'}.'</browseros>'.
'<browserversion>'.$env{'browser.version'}.'</browserversion>'.
@@ -318,6 +335,9 @@ sub packagemsg {
}
}
}
+ if ($senthide) {
+ $result .= '<senthide>$origmsgid</senthide>';
+ }
return ($msgid,$result);
}
@@ -408,7 +428,6 @@ sub unpackmsgid {
$shortsubj = &unescape($shortsubj);
$shortsubj = &HTML::Entities::decode($shortsubj);
$symb = &unescape($symb);
- if (!defined($processid)) { $fromcid = ''; }
my %status=();
unless ($skipstatus) {
if (ref($status_cache)) {
@@ -425,7 +444,7 @@ sub unpackmsgid {
sub sendemail {
- my ($to,$subject,$body,$to_uname,$to_udom,$user_lh)=@_;
+ my ($to,$subject,$body,$to_uname,$to_udom,$user_lh,$attachmenturl)=@_;
my $senderaddress='';
my $replytoaddress='';
my $msgsent;
@@ -435,14 +454,17 @@ sub sendemail {
$replytoaddress = 'do-not-reply@'.$hostname;
} else {
my %senderemails;
- my $have_sender;
+ my ($have_sender,$setreplyto);
if ($env{'form.reply_to_addr'}) {
my ($replytoname,$replytodom) = split(/:/,$env{'form.reply_to_addr'});
- if (!($replytoname eq $env{'user.name'} && $replytodom eq $env{'user.domain'})) {
+ if (($replytoname eq $env{'user.name'} && $replytodom eq $env{'user.domain'})) {
+ $setreplyto = 1;
+ } else {
if (&Apache::lonnet::homeserver($replytoname,$replytodom) ne 'no_host') {
%senderemails =
&Apache::loncommon::getemails($replytoname,$replytodom);
$have_sender = 1;
+ $setreplyto = 1;
}
}
}
@@ -452,7 +474,12 @@ sub sendemail {
foreach my $type ('permanentemail','critnotification','notification') {
if ($senderemails{$type}) {
($senderaddress) = split(/,/,$senderemails{$type});
- last if ($senderaddress);
+ if ($senderaddress) {
+ if ($setreplyto) {
+ $replytoaddress = $senderaddress;
+ }
+ last;
+ }
}
}
}
@@ -461,19 +488,18 @@ 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*** ".
&mt_user($user_lh,'A reply will not be received by the recipient!'))."\n\n".$body;
- my $msg = new Mail::Send;
- $msg->to($to);
- $msg->subject('[LON-CAPA] '.$subject);
- if ($replytoaddress) {
- $msg->add('Reply-to',$replytoaddress);
- }
- if ($senderaddress) {
- $msg->add('From',$senderaddress);
- }
- $msg->add('Content-type','text/plain; charset=UTF-8');
- if (my $fh = $msg->open()) {
- print $fh $body;
- $fh->close;
+ $attachmenturl = &Apache::lonnet::filelocation("",$attachmenturl);
+ my $filesize = (stat($attachmenturl))[7];
+ if ($filesize > 1048576) {
+ # Don't send if it exceeds 1 MB.
+ print '<p><span class="LC_error">'
+ .&mt('Email not sent. Attachment exceeds permitted length.')
+ .'</span><br /></p>';
+ } else {
+ # Otherwise build and send the email
+ $subject = '[LON-CAPA] '.$subject;
+ &Apache::loncommon::mime_email($senderaddress,$replytoaddress,$to,
+ $subject,$body,'','',$attachmenturl,'','');
$msgsent = 1;
}
return $msgsent;
@@ -482,7 +508,7 @@ sub sendemail {
# ==================================================== Send notification emails
sub sendnotification {
- my ($to,$touname,$toudom,$subj,$crit,$text,$msgid)=@_;
+ my ($to,$touname,$toudom,$subj,$crit,$text,$msgid,$attachmenturl)=@_;
my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'};
unless ($sender=~/\w/) {
$sender=$env{'user.name'}.':'.$env{'user.domain'};
@@ -492,10 +518,8 @@ sub sendnotification {
$text=~s/\<\;/\</gs;
$text=~s/\>\;/\>/gs;
- my $homeserver = &Apache::lonnet::homeserver($touname,$toudom);
- my $protocol = $Apache::lonnet::protocol{$homeserver};
- $protocol = 'http' if ($protocol ne 'https');
- my $url = $protocol.'://'.&Apache::lonnet::hostname($homeserver).
+ my $touhome = &Apache::lonnet::homeserver($touname,$toudom);
+ my $url = &Apache::lonnet::url_prefix('',$toudom,$touhome,'email').
'/adm/email?username='.$touname.'&domain='.$toudom.
'&display='.&escape($msgid);
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
@@ -539,16 +563,20 @@ to access the full message.',$url);
$subject = $subj;
}
- my ($blocked,$blocktext);
+ my ($blocked,$blocktext,$clientip);
+ $clientip = &Apache::lonnet::get_requestor_ip();
if (!$crit) {
my %setters;
- my ($startblock,$endblock) =
- &Apache::loncommon::blockcheck(\%setters,'com',$touname,$toudom);
+ my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+ &Apache::loncommon::blockcheck(\%setters,'com',$clientip,$touname,$toudom);
if ($startblock && $endblock) {
$blocked = 1;
my $showstart = &Apache::lonlocal::locallocaltime($startblock);
my $showend = &Apache::lonlocal::locallocaltime($endblock);
$blocktext = &mt_user($user_lh,'LON-CAPA messages sent to you between [_1] and [_2] will be inaccessible until the end of this time period, because you are a student in a course with an active communications block.',$showstart,$showend);
+ } elsif ($by_ip) {
+ $blocked = 1;
+ $blocktext = &mt_user($user_lh,'LON-CAPA messages sent to you will be inaccessible from your IP address [_1], because communication is being blocked for certain IP address(es).',$clientip);
}
}
if ($userenv{'notifywithhtml'} ne '') {
@@ -566,7 +594,7 @@ to access the full message.',$url);
}
$body = $bodybegin.$bodysubj.$sendtext.$bodyend;
}
- if (&sendemail($addr,$subject,$body,$touname,$toudom,$user_lh)) {
+ if (&sendemail($addr,$subject,$body,$touname,$toudom,$user_lh,$attachmenturl)) {
$numsent ++;
}
}
@@ -577,7 +605,7 @@ to access the full message.',$url);
my $htmlfree = &make_htmlfree($text);
$body = $bodybegin.$bodysubj.$htmlfree.$bodyend;
}
- if (&sendemail($to,$subject,$body,$touname,$toudom,$user_lh)) {
+ if (&sendemail($to,$subject,$body,$touname,$toudom,$user_lh,$attachmenturl)) {
$numsent ++;
}
}
@@ -709,7 +737,7 @@ sub store_instructor_comment {
sub user_crit_msg_raw {
my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage,
- $nosentstore,$recipid,$attachmenturl,$permresults)=@_;
+ $nosentstore,$recipid,$attachmenturl,$permresults,$senthide)=@_;
# Check if allowed missing
my ($status,$packed_message);
my $msgid='undefined';
@@ -727,11 +755,15 @@ sub user_crit_msg_raw {
$$sentmessage = $packed_message;
}
if (!$nosentstore) {
- (undef,my $packed_message_no_citation) =
+ my ($sentmsgid,$packed_message_no_citation) =
&packagemsg($subject,$message,undef,undef,$attachmenturl,$user,
- $domain,$msgid);
+ $domain,$msgid,undef,undef,undef,undef,undef,$senthide,$msgid);
if ($status eq 'ok' || $status eq 'con_delayed') {
- &store_sent_mail($msgid,$packed_message_no_citation);
+ if ($senthide && $sentmsgid) {
+ &store_sent_mail($sentmsgid,$packed_message_no_citation);
+ } else {
+ &store_sent_mail($msgid,$packed_message_no_citation);
+ }
}
}
} else {
@@ -746,7 +778,7 @@ sub user_crit_msg_raw {
my $numperm = 0;
my $permlogmsgstatus;
if ($critnotify) {
- $numcrit = &sendnotification($critnotify,$user,$domain,$subject,1,$text,$msgid);
+ $numcrit = &sendnotification($critnotify,$user,$domain,$subject,1,$text,$msgid,$attachmenturl);
}
if ($toperm && $permemail) {
if ($critnotify && $numcrit) {
@@ -755,7 +787,7 @@ sub user_crit_msg_raw {
}
}
unless ($numperm) {
- $numperm = &sendnotification($permemail,$user,$domain,$subject,1,$text,$msgid);
+ $numperm = &sendnotification($permemail,$user,$domain,$subject,1,$text,$msgid,$attachmenturl);
}
}
if ($toperm) {
@@ -781,7 +813,7 @@ sub user_crit_msg_raw {
sub user_crit_msg {
my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage,
- $nosentstore,$recipid,$attachmenturl,$permresults)=@_;
+ $nosentstore,$recipid,$attachmenturl,$permresults,$senthide)=@_;
my @status;
my %userenv = &Apache::lonnet::get('environment',['msgforward'],
$domain,$user);
@@ -792,13 +824,13 @@ sub user_crit_msg {
push(@status,
&user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
$sendback,$toperm,$sentmessage,$nosentstore,
- $recipid,$attachmenturl,$permresults));
+ $recipid,$attachmenturl,$permresults,$senthide));
}
} else {
push(@status,
&user_crit_msg_raw($user,$domain,$subject,$message,$sendback,
$toperm,$sentmessage,$nosentstore,$recipid,
- $attachmenturl,$permresults));
+ $attachmenturl,$permresults,$senthide));
}
if (wantarray) {
return @status;
@@ -847,7 +879,7 @@ sub user_crit_received {
sub user_normal_msg_raw {
my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
$toperm,$currid,$newid,$sentmessage,$crsmsgid,$symb,$restitle,
- $error,$nosentstore,$recipid,$permresults)=@_;
+ $error,$nosentstore,$recipid,$permresults,$senthide)=@_;
# Check if allowed missing
my ($status,$packed_message);
my $msgid='undefined';
@@ -869,11 +901,16 @@ sub user_normal_msg_raw {
('email_status',{'recnewemail'=>time},$domain,$user);
# Into sent-mail folder if sent mail storage required
if (!$nosentstore) {
- (undef,my $packed_message_no_citation) =
+ my ($sentmsgid,$packed_message_no_citation) =
&packagemsg($subject,$message,undef,$baseurl,$attachmenturl,
- $user,$domain,$currid,undef,$crsmsgid,$symb,$error);
+ $user,$domain,$currid,undef,$crsmsgid,$symb,$error,
+ undef,$senthide,$msgid);
if ($status eq 'ok' || $status eq 'con_delayed') {
- &store_sent_mail($msgid,$packed_message_no_citation);
+ if ($senthide && $sentmsgid) {
+ &store_sent_mail($sentmsgid,$packed_message_no_citation);
+ } else {
+ &store_sent_mail($msgid,$packed_message_no_citation);
+ }
}
}
if (ref($newid) eq 'SCALAR') {
@@ -890,7 +927,7 @@ sub user_normal_msg_raw {
my $numperm = 0;
my $permlogmsgstatus;
if ($notify) {
- $numnotify = &sendnotification($notify,$user,$domain,$subject,0,$text,$msgid);
+ $numnotify = &sendnotification($notify,$user,$domain,$subject,0,$text,$msgid,$attachmenturl);
}
if ($toperm && $permemail) {
if ($notify && $numnotify) {
@@ -900,7 +937,7 @@ sub user_normal_msg_raw {
}
unless ($numperm) {
$numperm = &sendnotification($permemail,$user,$domain,$subject,0,
- $text,$msgid);
+ $text,$msgid,$attachmenturl);
}
}
if ($toperm) {
@@ -924,7 +961,7 @@ sub user_normal_msg_raw {
sub user_normal_msg {
my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
$toperm,$sentmessage,$symb,$restitle,$error,$nosentstore,$recipid,
- $permresults)=@_;
+ $permresults,$senthide)=@_;
my @status;
my %userenv = &Apache::lonnet::get('environment',['msgforward'],
$domain,$user);
@@ -936,13 +973,15 @@ sub user_normal_msg {
&user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
$citation,$baseurl,$attachmenturl,$toperm,
undef,undef,$sentmessage,undef,$symb,
- $restitle,$error,$nosentstore,$recipid,$permresults));
+ $restitle,$error,$nosentstore,$recipid,
+ $permresults,$senthide));
}
} else {
push(@status,&user_normal_msg_raw($user,$domain,$subject,$message,
$citation,$baseurl,$attachmenturl,$toperm,
undef,undef,$sentmessage,undef,$symb,
- $restitle,$error,$nosentstore,$recipid,$permresults));
+ $restitle,$error,$nosentstore,$recipid,
+ $permresults,$senthide));
}
if (wantarray) {
return @status;