--- loncom/interface/lonmsgdisplay.pm 2019/08/12 15:15:56 1.190 +++ loncom/interface/lonmsgdisplay.pm 2025/01/29 09:11:10 1.202 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.190 2019/08/12 15:15:56 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.202 2025/01/29 09:11:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,6 +111,7 @@ use Apache::loncommunicate; use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonselstudent(); +use Apache::lonenc(); use lib '/home/httpd/lib/perl/'; use LONCAPA qw(:DEFAULT :match); @@ -228,41 +229,39 @@ function folder_choice(targetform,caller
'.&mt('Folder Actions').' - - - - - - - - -
'.$html_lt{'fold'}.'
'."\n". - &Apache::loncommon::select_form($folder,'folder',\%formhash).' - 		'.$html_lt{'show'}.'
'."\n". +
+
+
+
'.$html_lt{'status'}.'
'."\n". - &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).' - 		- '.$html_lt{'actn'}.'
'."\n".' + \%show).' + +
+
+
+ '. ' -
- '.&mt('New Folder').'
'."\n".' + +
+
+
- + -
+
'."\n". ''. - ''. - ($folder=~/^critical/?'
':''); + ''; return $output; } @@ -782,11 +781,14 @@ sub groupmail_header { if ($grouppagelink) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>$grouppagelink, - text=>"Group: $description", - title=>"Go to group's home page"},); + text=>&mt('Group').": $description", + title=>&mt("Go to group's home page"), + no_mt=>1, + },); } else { &Apache::lonhtmlcommon::add_breadcrumb - ({text=>"Group: $description",}); + ({text=>&mt('Group').": $description", + no_mt=>1,}); } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/email?compose=group&group=". @@ -799,8 +801,9 @@ sub groupmail_header { title=>"E-mails sent"},); } my $groupheader = &Apache::loncommon::start_page('Group Message'); - $groupheader .= &Apache::lonhtmlcommon::breadcrumbs - ('Group - '.$env{'form.group'}.' Email'); + $groupheader .= &Apache::lonhtmlcommon::breadcrumbs( + &mt('Group messages - [_1]',$description), + undef,undef,undef,undef,1); return $groupheader; } @@ -861,7 +864,7 @@ sub discrit { .&Apache::lonhtmlcommon::row_closure(1); } $result .= &Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value') - .'
'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'
' + .'
'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'
' .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value') .'
'; @@ -908,7 +911,7 @@ sub discrit { } sub sortedmessages { - my ($blocked,$startblock,$endblock,$numblocked,$folder,$msgstatus) = @_; + my ($blocked,$startblock,$endblock,$by_ip,$numblocked,$folder,$msgstatus) = @_; my $suffix=&Apache::lonmsg::foldersuffix($folder); my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix); #unpack the varibles and repack into temp for sorting @@ -940,7 +943,8 @@ sub sortedmessages { push(@temp1,$content{'recuser'},$content{'recdomain'}); } # Check whether message was sent during blocking period. - if ($sendtime >= $startblock && ($sendtime <= $endblock && $endblock > 0) ) { + if (($by_ip) || + (($sendtime >= $startblock) && ($sendtime <= $endblock && $endblock > 0))) { $$blocked{$msgid} = 'ON'; $$numblocked ++; } else { @@ -1067,7 +1071,9 @@ sub disfolder { my %blocked = (); my %setters = (); my $numblocked = 0; - my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com'); + my $clientip = &Apache::lonnet::get_requestor_ip($r); + 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.', nome => 'No messages have been selected to apply this action to.', @@ -1111,7 +1117,7 @@ sub disfolder { ENDDISHEADER my $fsqs='&folder='.$folder; - my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); + my @temp=&sortedmessages(\%blocked,$startblock,$endblock,$by_ip,\$numblocked,$folder,$msgstatus); my $totalnumber=$#temp+1; if ($totalnumber < 1) { $r->print('

'); @@ -1124,9 +1130,10 @@ ENDDISHEADER } $r->print('

'); if ($numblocked > 0) { - $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, + $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom, \%setters)); } + $r->print(''); return; } my $interdis = $env{'form.interdis'}; @@ -1144,7 +1151,7 @@ ENDDISHEADER $r->print('
'. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). - ' '); + '#'); if ($env{'form.sortedby'} eq "revdate") { $r->print(''.&mt('Date').''); } else { @@ -1223,10 +1230,10 @@ ENDDISHEADER } } my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime); - $r->print(''.(($status eq 'new')?'':''). + $r->print(''); + ' value="'.$origID.'" />'); foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) { $r->print(''.(($status eq 'new')?'':''). ''. @@ -1264,16 +1271,15 @@ ENDDISHEADER $r->print('
'.&mt('Message Actions').' - - - '."\n". - ''."\n"); + $r->print("\n".''."\n"); if (keys(%gotfolders) > 0) { $r->print(''); } - $r->print(''."\n". - '
'.&mt('Select Messages').'
+
+ '.&mt('Select Messages').'
'."\n". ' '."\n". ' -
'.&mt('Action').'
'."\n". + '."\n". + '
'.&mt('Destination folder').'
'); @@ -1304,30 +1310,35 @@ ENDDISHEADER $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders). '		'. - '
'."\n". + $r->print('
'. + '
'."\n". '
'."\n" ); my $postedstartdis=$startdis+1; $r->print(''); if ($numblocked > 0) { $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, - \%setters)); + $by_ip,$clientip,$blockdom,\%setters)); } } sub blocked_in_folder { - my ($numblocked,$startblock,$endblock,$setters) = @_; - my $beginblock = &Apache::lonlocal::locallocaltime($startblock); - my $finishblock = &Apache::lonlocal::locallocaltime($endblock); - my $output = '

'. + my ($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom,$setters) = @_; + my $output; + if ($by_ip) { + $output = '

'. + &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages is blocked for your current IP address: [_2].',$numblocked,$clientip).'
'. + &mt('Note: communication is being blocked for certain IP address(es).'); + } else { + my $beginblock = &Apache::lonlocal::locallocaltime($startblock); + my $finishblock = &Apache::lonlocal::locallocaltime($endblock); + $output = '

'. &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock); + } #$output .= &Apache::loncommon::build_block_table($startblock,$endblock, # $setters); - - my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com"); + my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip); $output .="

".$blocktext; return $output; @@ -1338,6 +1349,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('

'. + &mt('Sending of LON-CAPA messages is blocked for your current IP address: [_1].',$clientip).'

'. + '
  • '. + &mt('Note: communication is being blocked for certain IP address(es).'). + '
  • '. + &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',$showdom). + '
'); + return; + } my $suffix=&Apache::lonmsg::foldersuffix($folder); my ($cdom,$cnum,$group,$refarg); if (exists($env{'form.group'})) { @@ -1974,7 +2005,7 @@ sub disfacetoface { &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.':'. $content{'senderdomain'}.') '.$content{'time'}. - '
'.
+            '
'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
 	      '
';
      }
@@ -2102,14 +2133,16 @@ sub displaymessage {
     my %setters = ();
     my $numblocked = 0;
     my $crstype = &Apache::loncommon::course_type();
+    my $clientip = &Apache::lonnet::get_requestor_ip($r);
 
 # info to generate "next" and "previous" buttons and check if message is blocked
-    my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
-    my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
+    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' ) {
         &printheader($r,'/adm/email',&mt('Display a Message'));
         #$r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
-        my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com");
+        my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip);
         $r->print("
".$blocktext);
         return;
     }
@@ -2143,8 +2176,28 @@ sub displaymessage {
 
 
     my $number_of_messages = scalar(@messages); #subtract 1 for last index
+    my $head_extra;
+
+# if student's view of resource will be included
+# get  tag(s) for css file(s) in use, and pass to &header to include
+# in call to loncommon::start_page()
+
+    if (($env{'request.course.id'} eq $content{'courseid'}) &&
+        (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
+        my $symb;
+        if (defined($content{'symb'})) {
+            $symb = $content{'symb'};
+        } elsif (defined($content{'baseurl'})) {
+            $symb=&Apache::lonnet::symbread($content{'baseurl'});
+        }
+        if ($symb) {
+            $head_extra = &Apache::loncommon::css_links($symb);
+        }
+    }
+
 # start output
-    &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
+    &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',
+                 $content{'baseurl'},$head_extra);
 
 # Prepare available functions
     my @functionlist;
@@ -2448,12 +2501,16 @@ sub displaymessage {
                               $showsymb,$env{'user.domain'},$env{'user.name'});
                 if ($symb) {
                     if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
-                        $showsymb = &Apache::lonenc::check_encrypt($symb);
+                        unless ($showsymb =~ m{^/enc/}) {
+                            $showsymb = &Apache::lonenc::encrypted($showsymb);
+                        }
                     }
                     $symblink = '?symb='.$showsymb;
                 }
                 if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
-                    $showurl = $baseurl;
+                    unless ($showurl =~ m{^/enc/}) {
+                        $showurl = &Apache::lonenc::encrypted($showurl);
+                    }
                 }
                 $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
                          .''.$restitle.''
@@ -2493,7 +2550,7 @@ sub displaymessage {
 
     # Message
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))
-             .'
'
+             .'
'
 	     .&Apache::lontexconvert::msgtexconverted($content{'message'},1)
 	     .'
'
     );
@@ -2647,9 +2704,10 @@ sub displayresource {
      && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
         my $symb;
         if (defined($content{'symb'})) {
-            $symb = $content{'symb'};
-        } else { 
-	    $symb=&Apache::lonnet::symbread($content{'baseurl'});
+            $symb = &Apache::lonenc::check_decrypt($content{'symb'});
+        } elsif (defined($content{'baseurl'})) {
+            $symb =
+                &Apache::lonnet::symbread(&Apache::lonenc::check_decrypt($content{'baseurl'}));
         }
 # Could not get a symb, give up
 	unless ($symb) { return $content{'citation'}; }
@@ -2685,13 +2743,16 @@ sub displayresource {
 # ================================================================== The Header
 
 sub header {
-    my ($r,$title,$baseurl)=@_;
+    my ($r,$title,$baseurl,$head_extra)=@_;
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
 	$extra .= "";
     }
     $extra .= '';
+    if ($head_extra) {
+        $extra .= "\n$head_extra";
+    }
     $r->print(&Apache::loncommon::start_page('Messages',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
@@ -2701,11 +2762,11 @@ sub header {
 # ---------------------------------------------------------------- Print header
 
 sub printheader {
-    my ($r,$url,$desc,$title,$baseurl)=@_;
+    my ($r,$url,$desc,$title,$baseurl,$head_extra)=@_;
     &Apache::lonhtmlcommon::add_breadcrumb
 	({href=>$url,
 	  text=>$desc});
-    &header($r,$title,$baseurl);
+    &header($r,$title,$baseurl,$head_extra);
 }
 
 # ------------------------------------------------------------ Store the comment
@@ -2762,7 +2823,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.');
@@ -3199,9 +3267,24 @@ sub handler {
          'sendreply','compose','sendmail','critical','recname','recdom',
          'recordftf','sortedby','folder','startdis','interdis',
 	 'showcommentbaseurl','dismode','group','subject','text','ref',
-         'msgstatus']);
+         'msgstatus','btoken']);
     $sqs='&sortedby='.$env{'form.sortedby'};
 
+# ----------- Check if access was from balancer to server with existing session
+
+    if ($env{'form.btoken'}) {
+        my %info = &Apache::lonnet::tmpget($env{'form.btoken'});
+        &Apache::lonnet::tmpdel($env{'form.btoken'});
+        delete($env{'form.btoken'});
+        unless ($env{'form.display'}) {
+            if (($info{'display'}) && ($info{'mailrecip'})) {
+                if (&unescape($info{'mailrecip'}) eq $env{'user.name'}.':'.$env{'user.domain'}) {
+                    $env{'form.display'} = &unescape($info{'display'});
+                }
+            }
+        }
+    }
+
 # ------------------------------------------------------ They checked for email
     &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 
@@ -3456,8 +3539,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 .= '
'.&mt('Could not deliver forwarded message.').' '.
-                                &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
+                    $message .= '
'.&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);