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

[raeburn]

raeburn		Wed Jan 19 03:33:46 2022 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmsg.pm 
  Log:
  - For 2.11
    Backport 1.248
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.239.2.3 loncom/interface/lonmsg.pm:1.239.2.4
--- loncom/interface/lonmsg.pm:1.239.2.3	Mon Dec 13 23:54:26 2021
+++ loncom/interface/lonmsg.pm	Wed Jan 19 03:33:46 2022
@@ -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.239.2.4 2022/01/19 03:33:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,7 +120,7 @@
 
 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 @@
 
 =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 @@
 
 
 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,6 +229,22 @@
     #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();
@@ -319,6 +335,9 @@
             }
         }
     }
+    if ($senthide) {
+        $result .= '<senthide>$origmsgid</senthide>';
+    }
     return ($msgid,$result);
 }
 
@@ -714,7 +733,7 @@
 
 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';
@@ -732,11 +751,15 @@
             $$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 {
@@ -786,7 +809,7 @@
 
 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);
@@ -797,13 +820,13 @@
          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;
@@ -852,7 +875,7 @@
 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';
@@ -874,11 +897,16 @@
                          ('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') {
@@ -929,7 +957,7 @@
 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);
@@ -941,13 +969,15 @@
 	        &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;