--- loncom/interface/lonmsg.pm	2018/12/27 18:14:25	1.244
+++ loncom/interface/lonmsg.pm	2022/01/18 17:33:13	1.248
@@ -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.248 2022/01/18 17:33:13 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
@@ -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);
 }
 
@@ -470,8 +490,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;
@@ -494,6 +514,7 @@ sub sendnotification {
     my $hostname = &Apache::lonnet::hostname($homeserver);
     my $protocol = $Apache::lonnet::protocol{$homeserver};
     $protocol = 'http' if ($protocol ne 'https');
+#FIXME
     my $url = $protocol.'://'.$hostname.
               '/adm/email?username='.$touname.'&domain='.$toudom.
               '&display='.&escape($msgid);
@@ -538,16 +559,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 '') {
@@ -708,7 +733,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';
@@ -726,11 +751,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 {
@@ -780,7 +809,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);
@@ -791,13 +820,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;
@@ -846,7 +875,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';
@@ -868,11 +897,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') {
@@ -923,7 +957,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);
@@ -935,13 +969,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;