';
@@ -896,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
@@ -928,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 {
@@ -1055,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.',
@@ -1099,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('
');
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'};
@@ -1132,7 +1151,7 @@ ENDDISHEADER
$r->print('