--- loncom/interface/lonmsgdisplay.pm	2021/11/30 15:55:37	1.194
+++ loncom/interface/lonmsgdisplay.pm	2022/01/19 15:04:15	1.197
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.194 2021/11/30 15:55:37 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.197 2022/01/19 15:04:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1073,7 +1073,7 @@ sub disfolder {
     my %setters = ();
     my $numblocked = 0;
     my $clientip = &Apache::lonnet::get_requestor_ip($r);
-    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = 
+    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
         &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
     my %js_lt = &Apache::lonlocal::texthash(
                       sede => 'Select a destination folder to which the messages will be moved.',
@@ -1321,7 +1321,7 @@ ENDDISHEADER
     $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');
     if ($numblocked > 0) {
         $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
-                                     \%setters));
+                                     $by_ip,$clientip,$blockdom,\%setters));
     }
 }
 
@@ -1340,7 +1340,6 @@ sub blocked_in_folder {
     }
     #$output .= &Apache::loncommon::build_block_table($startblock,$endblock,
     #                                                 $setters);
-    
     my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip);
     $output .="<br /><br />".$blocktext;
 
@@ -1352,6 +1351,26 @@ sub blocked_in_folder {
 sub compout {
     my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode,
         $multiforward)=@_;
+    my $clientip = &Apache::lonnet::get_requestor_ip($r);
+    my %setters;
+    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+        &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
+    if ($by_ip) {
+        my $showdom = &Apache::lonnet::domain($blockdom);
+        if ($showdom eq '') {
+            $showdom = $blockdom;
+        }
+        $r->print(&Apache::loncommon::start_page('Messages'));
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Send and display messages'));
+        $r->print('<p class="LC_warning">'.
+                 &mt('Sending of LON-CAPA messages is blocked for your current IP address: [_1].',$clientip).'</p>'.
+                 '<ul><li>'.
+                 &mt('Note: communication is being blocked for certain IP address(es).').
+                 '</li><li>'.
+                 &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',$showdom).
+                 '</li></ul>');
+        return;
+    }
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my ($cdom,$cnum,$group,$refarg);
     if (exists($env{'form.group'})) {
@@ -2119,7 +2138,7 @@ sub displaymessage {
     my $clientip = &Apache::lonnet::get_requestor_ip($r);
 
 # info to generate "next" and "previous" buttons and check if message is blocked
-    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = 
+    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
         &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
     my @messages=&sortedmessages(\%blocked,$startblock,$endblock,$by_ip,\$numblocked,$folder,$msgstatus);
     if ( $blocked{$msgid} eq 'ON' ) {
@@ -2801,7 +2820,14 @@ sub sendoffmail {
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     }
-    if ($env{'form.send'}) {
+    my $clientip = &Apache::lonnet::get_requestor_ip($r);
+    my %setters;
+    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+        &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
+    if ($by_ip) {
+        &printheader($r,'','Sending messages blocked from your location.');
+        return 'blocked';
+    } elsif ($env{'form.send'}) {
         if (!$env{'form.multiforward'}) {
             if ($group eq '') {
 	        &printheader($r,'','Messages being sent.');
@@ -3495,8 +3521,12 @@ sub handler {
                 my $count = keys(%forwardfail);
                 my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
                 foreach my $key (keys(%forwardfail)) {
-                    $message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.
-                                &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
+                    $message .= '<br />'.&mt('Could not deliver forwarded message.').' ';
+                    if ($forwardfail{$key} eq 'blocked') {
+                        $message .= &mt('Sending messages is blocked from your IP address');
+                    } else {
+                        $message .= &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
+                    }
                 }
                 $message = &Apache::loncommon::confirmwrapper($message);
                 $r->print($message);