--- loncom/interface/lonmsg.pm	2024/02/08 03:09:10	1.239.2.5
+++ loncom/interface/lonmsg.pm	2015/06/18 23:02:48	1.241
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.239.2.5 2024/02/08 03:09:10 raeburn Exp $
+# $Id: lonmsg.pm,v 1.241 2015/06/18 23:02:48 musolffc 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, $toperm, $sentmessage, $nosentstore, $recipid, $attachmenturl, $permresults, $senthide)>: 
+=item * B<user_crit_msg($user, $domain, $subject, $message, $sendback, $nosentstore, $recipid, $attachmenturl, $permresults)>: 
     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,$senthide)>:
+       $error,$nosentstore,$recipid,$permresults)>:
  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,$senthide,$origmsgid)=@_;
+    my ($subject,$message,$citation,$baseurl,$attachmenturl,
+	$recuser,$recdomain,$msgid,$type,$crsmsgid,$symb,$error,$recipid)=@_;
     $message =&HTML::Entities::encode($message,'<>&"');
     $citation=&HTML::Entities::encode($citation,'<>&"');
     $subject =&HTML::Entities::encode($subject,'<>&"');
@@ -229,25 +229,8 @@ 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'},
@@ -267,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>'.
@@ -335,9 +318,6 @@ sub packagemsg {
             }
         }
     }
-    if ($senthide) {
-        $result .= '<senthide>$origmsgid</senthide>';
-    }
     return ($msgid,$result);
 }
 
@@ -417,14 +397,10 @@ sub buildmsgid {
 }
 
 sub unpackmsgid {
-    my ($msgid,$folder,$skipstatus,$status_cache,$onlycid)=@_;
+    my ($msgid,$folder,$skipstatus,$status_cache)=@_;
     $msgid=&unescape($msgid);
     my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid,
         $processid,$symb,$error) = split(/\:/,&unescape($msgid));
-    if (!defined($processid)) { $fromcid = ''; }
-    if (($onlycid) && ($onlycid ne $fromcid)) {
-        return ($sendtime,'',$fromname,$fromdomain,'',$fromcid,'',$error);
-    }
     $shortsubj = &unescape($shortsubj);
     $shortsubj = &HTML::Entities::decode($shortsubj);
     $symb = &unescape($symb);
@@ -455,17 +431,14 @@ sub sendemail {
         $replytoaddress = 'do-not-reply@'.$hostname;
     } else {
         my %senderemails;
-        my ($have_sender,$setreplyto);
+        my $have_sender;
         if ($env{'form.reply_to_addr'}) {
             my ($replytoname,$replytodom) = split(/:/,$env{'form.reply_to_addr'});
-            if (($replytoname eq $env{'user.name'} && $replytodom eq $env{'user.domain'})) {
-                $setreplyto = 1;
-            } else {
+            if (!($replytoname eq $env{'user.name'} && $replytodom eq $env{'user.domain'})) {
                 if (&Apache::lonnet::homeserver($replytoname,$replytodom) ne 'no_host') {
                     %senderemails = 
                         &Apache::loncommon::getemails($replytoname,$replytodom);
                     $have_sender = 1;
-                    $setreplyto = 1;
                 }
             }
         }
@@ -475,12 +448,7 @@ sub sendemail {
         foreach my $type ('permanentemail','critnotification','notification') {
             if ($senderemails{$type}) {
                 ($senderaddress) = split(/,/,$senderemails{$type});
-                if ($senderaddress) {
-                    if ($setreplyto) {
-                        $replytoaddress = $senderaddress;
-                    }
-                    last;
-                }
+                last if ($senderaddress);
             }
         }
     }
@@ -567,20 +535,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 '') {
@@ -741,7 +705,7 @@ sub store_instructor_comment {
 
 sub user_crit_msg_raw {
     my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage,
-        $nosentstore,$recipid,$attachmenturl,$permresults,$senthide)=@_;
+        $nosentstore,$recipid,$attachmenturl,$permresults)=@_;
 # Check if allowed missing
     my ($status,$packed_message);
     my $msgid='undefined';
@@ -759,15 +723,11 @@ sub user_crit_msg_raw {
             $$sentmessage = $packed_message;
         }
         if (!$nosentstore) {
-            my ($sentmsgid,$packed_message_no_citation) =
+            (undef,my $packed_message_no_citation) =
             &packagemsg($subject,$message,undef,undef,$attachmenturl,$user,
-                        $domain,$msgid,undef,undef,undef,undef,undef,$senthide,$msgid);
+                        $domain,$msgid);
             if ($status eq 'ok' || $status eq 'con_delayed') {
-                if ($senthide && $sentmsgid) {
-                    &store_sent_mail($sentmsgid,$packed_message_no_citation);
-                } else {
-                    &store_sent_mail($msgid,$packed_message_no_citation);
-                }
+                &store_sent_mail($msgid,$packed_message_no_citation);
             }
         }
     } else {
@@ -817,7 +777,7 @@ sub user_crit_msg_raw {
 
 sub user_crit_msg {
     my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage,
-        $nosentstore,$recipid,$attachmenturl,$permresults,$senthide)=@_;
+        $nosentstore,$recipid,$attachmenturl,$permresults)=@_;
     my @status;
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
@@ -828,13 +788,13 @@ sub user_crit_msg {
          push(@status,
 	      &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
 				 $sendback,$toperm,$sentmessage,$nosentstore,
-                                 $recipid,$attachmenturl,$permresults,$senthide));
+                                 $recipid,$attachmenturl,$permresults));
        }
     } else { 
 	push(@status,
 	     &user_crit_msg_raw($user,$domain,$subject,$message,$sendback,
 				$toperm,$sentmessage,$nosentstore,$recipid,
-                                $attachmenturl,$permresults,$senthide));
+                                $attachmenturl,$permresults));
     }
     if (wantarray) {
 	return @status;
@@ -883,7 +843,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,$senthide)=@_;
+        $error,$nosentstore,$recipid,$permresults)=@_;
 # Check if allowed missing
     my ($status,$packed_message);
     my $msgid='undefined';
@@ -905,16 +865,11 @@ sub user_normal_msg_raw {
                          ('email_status',{'recnewemail'=>time},$domain,$user);
 # Into sent-mail folder if sent mail storage required
        if (!$nosentstore) {
-           my ($sentmsgid,$packed_message_no_citation) =
+           (undef,my $packed_message_no_citation) =
                &packagemsg($subject,$message,undef,$baseurl,$attachmenturl,
-                           $user,$domain,$currid,undef,$crsmsgid,$symb,$error,
-                           undef,$senthide,$msgid);
+                           $user,$domain,$currid,undef,$crsmsgid,$symb,$error);
            if ($status eq 'ok' || $status eq 'con_delayed') {
-               if ($senthide && $sentmsgid) {
-                   &store_sent_mail($sentmsgid,$packed_message_no_citation);
-               } else { 
-                   &store_sent_mail($msgid,$packed_message_no_citation);
-               }
+               &store_sent_mail($msgid,$packed_message_no_citation);
            }
        }
        if (ref($newid) eq 'SCALAR') {
@@ -965,7 +920,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,$senthide)=@_;
+        $permresults)=@_;
     my @status;
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
@@ -977,15 +932,13 @@ 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,$senthide));
+                                     $restitle,$error,$nosentstore,$recipid,$permresults));
         }
     } 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,$senthide));
+                                     $restitle,$error,$nosentstore,$recipid,$permresults));
     }
     if (wantarray) {
         return @status;