--- loncom/interface/lonmsg.pm	2021/12/13 23:54:26	1.239.2.3
+++ loncom/interface/lonmsg.pm	2015/07/21 21:26:32	1.243
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.239.2.3 2021/12/13 23:54:26 raeburn Exp $
+# $Id: lonmsg.pm,v 1.243 2015/07/21 21:26:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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);
@@ -231,7 +231,6 @@ 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'},
@@ -251,7 +250,7 @@ sub packagemsg {
     }
     $result .= '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
            '<host>'.$ENV{'HTTP_HOST'}.'</host>'.
-	   '<client>'.$ip.'</client>'.
+	   '<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.
 	   '<browsertype>'.$env{'browser.type'}.'</browsertype>'.
 	   '<browseros>'.$env{'browser.os'}.'</browseros>'.
 	   '<browserversion>'.$env{'browser.version'}.'</browserversion>'.
@@ -409,7 +408,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)) {
@@ -426,7 +424,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;
@@ -462,19 +460,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, $to, $subject, $body, ,'',
+                                        '', $attachmenturl, '', '');
         $msgsent = 1;
     }
     return $msgsent;
@@ -483,7 +480,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'};
@@ -540,20 +537,16 @@ to access the full message.',$url);
         $subject = $subj;
     }
  
-    my ($blocked,$blocktext,$clientip);
-    $clientip = &Apache::lonnet::get_requestor_ip();
+    my ($blocked,$blocktext);
     if (!$crit) {
         my %setters;
-        my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = 
-            &Apache::loncommon::blockcheck(\%setters,'com',$clientip,$touname,$toudom);
+        my ($startblock,$endblock) = 
+            &Apache::loncommon::blockcheck(\%setters,'com',$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 '') {
@@ -571,7 +564,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 ++;
             }
         }
@@ -582,7 +575,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 ++;
         }
     }
@@ -751,7 +744,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) {
@@ -760,7 +753,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) {
@@ -895,7 +888,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) {
@@ -905,7 +898,7 @@ sub user_normal_msg_raw {
            }
            unless ($numperm) {
                $numperm = &sendnotification($permemail,$user,$domain,$subject,0,
-                                            $text,$msgid);
+                                            $text,$msgid,$attachmenturl);
            }
        }
        if ($toperm) {