Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.194 and 1.195

version 1.194, 2021/11/30 15:55:37 version 1.195, 2021/11/30 16:16:14
Line 1073  sub disfolder { Line 1073  sub disfolder {
     my %setters = ();      my %setters = ();
     my $numblocked = 0;      my $numblocked = 0;
     my $clientip = &Apache::lonnet::get_requestor_ip($r);      my $clientip = &Apache::lonnet::get_requestor_ip($r);
     my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =       my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
         &Apache::loncommon::blockcheck(\%setters,'com',$clientip);          &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
     my %js_lt = &Apache::lonlocal::texthash(      my %js_lt = &Apache::lonlocal::texthash(
                       sede => 'Select a destination folder to which the messages will be moved.',                        sede => 'Select a destination folder to which the messages will be moved.',
Line 1321  ENDDISHEADER Line 1321  ENDDISHEADER
     $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');      $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');
     if ($numblocked > 0) {      if ($numblocked > 0) {
         $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,          $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
                                      \%setters));                                       $by_ip,$clientip,$blockdom,\%setters));
     }      }
 }  }
   
Line 1340  sub blocked_in_folder { Line 1340  sub blocked_in_folder {
     }      }
     #$output .= &Apache::loncommon::build_block_table($startblock,$endblock,      #$output .= &Apache::loncommon::build_block_table($startblock,$endblock,
     #                                                 $setters);      #                                                 $setters);
       
     my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip);      my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip);
     $output .="<br /><br />".$blocktext;      $output .="<br /><br />".$blocktext;
   
Line 2119  sub displaymessage { Line 2118  sub displaymessage {
     my $clientip = &Apache::lonnet::get_requestor_ip($r);      my $clientip = &Apache::lonnet::get_requestor_ip($r);
   
 # info to generate "next" and "previous" buttons and check if message is blocked  # info to generate "next" and "previous" buttons and check if message is blocked
     my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =       my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
         &Apache::loncommon::blockcheck(\%setters,'com',$clientip);          &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
     my @messages=&sortedmessages(\%blocked,$startblock,$endblock,$by_ip,\$numblocked,$folder,$msgstatus);      my @messages=&sortedmessages(\%blocked,$startblock,$endblock,$by_ip,\$numblocked,$folder,$msgstatus);
     if ( $blocked{$msgid} eq 'ON' ) {      if ( $blocked{$msgid} eq 'ON' ) {

Removed from v.1.194  
changed lines
  Added in v.1.195


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