[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmsg.pm

[raeburn]

raeburn		Mon Dec 13 23:54:27 2021 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmsg.pm 
  Log:
  - For 2.11
    Backport 1.247
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.239.2.2 loncom/interface/lonmsg.pm:1.239.2.3
--- loncom/interface/lonmsg.pm:1.239.2.2	Mon Jan  4 03:44:12 2021
+++ loncom/interface/lonmsg.pm	Mon Dec 13 23:54:26 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.239.2.2 2021/01/04 03:44:12 raeburn Exp $
+# $Id: lonmsg.pm,v 1.239.2.3 2021/12/13 23:54:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -540,16 +540,20 @@
         $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 '') {