--- loncom/interface/lonmsg.pm 2018/12/27 18:14:25 1.244
+++ loncom/interface/lonmsg.pm 2020/12/18 15:23:02 1.246
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.244 2018/12/27 18:14:25 raeburn Exp $
+# $Id: lonmsg.pm,v 1.246 2020/12/18 15:23:02 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -231,6 +231,7 @@ sub packagemsg {
$attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
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 +251,7 @@ sub packagemsg {
}
$result .= ''.$ENV{'SERVER_NAME'}.''.
''.$ENV{'HTTP_HOST'}.''.
- ''.$ENV{'REMOTE_ADDR'}.''.
+ ''.$ip.''.
''.$env{'browser.type'}.''.
''.$env{'browser.os'}.''.
''.$env{'browser.version'}.''.
@@ -470,8 +471,8 @@ sub sendemail {
} else {
# Otherwise build and send the email
$subject = '[LON-CAPA] '.$subject;
- &Apache::loncommon::mime_email($senderaddress, $to, $subject, $body, ,'',
- '', $attachmenturl, '', '');
+ &Apache::loncommon::mime_email($senderaddress,$replytoaddress,$to,
+ $subject,$body,'','',$attachmenturl,'','');
$msgsent = 1;
}
return $msgsent;