[BACK]Return to lonmsgdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.181.2.8 and 1.181.2.9.2.1

version 1.181.2.8, 2021/12/14 00:20:07 version 1.181.2.9.2.1, 2023/01/23 02:19:19
Line 1351  sub blocked_in_folder { Line 1351  sub blocked_in_folder {
 sub compout {  sub compout {
     my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode,      my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode,
         $multiforward)=@_;          $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 $suffix=&Apache::lonmsg::foldersuffix($folder);
     my ($cdom,$cnum,$group,$refarg);      my ($cdom,$cnum,$group,$refarg);
     if (exists($env{'form.group'})) {      if (exists($env{'form.group'})) {
Line 2793  sub sendoffmail { Line 2813  sub sendoffmail {
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};          $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};          $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 (!$env{'form.multiforward'}) { 
             if ($group eq '') {              if ($group eq '') {
         &printheader($r,'','Messages being sent.');          &printheader($r,'','Messages being sent.');
Line 3138  sub handler { Line 3165  sub handler {
          'sendreply','compose','sendmail','critical','recname','recdom',           'sendreply','compose','sendmail','critical','recname','recdom',
          'recordftf','sortedby','folder','startdis','interdis',           'recordftf','sortedby','folder','startdis','interdis',
  'showcommentbaseurl','dismode','group','subject','text','ref',   'showcommentbaseurl','dismode','group','subject','text','ref',
          'msgstatus']);           'msgstatus','btoken']);
     $sqs='&amp;sortedby='.$env{'form.sortedby'};      $sqs='&amp;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  # ------------------------------------------------------ They checked for email
     &Apache::lonnet::put('email_status',{'recnewemail'=>0});      &Apache::lonnet::put('email_status',{'recnewemail'=>0});
   
Line 3395  sub handler { Line 3437  sub handler {
                 my $count = keys(%forwardfail);                  my $count = keys(%forwardfail);
                 my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);                  my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
                 foreach my $key (keys(%forwardfail)) {                  foreach my $key (keys(%forwardfail)) {
                     $message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.                      $message .= '<br />'.&mt('Could not deliver forwarded message.').' ';
                                 &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';                      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);                  $message = &Apache::loncommon::confirmwrapper($message);
                 $r->print($message);                  $r->print($message);
Removed from v.1.181.2.8  
changed lines
  Added in v.1.181.2.9.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>