MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' into develop

pull/7055/head
iglocska 2021-02-19 20:33:44 +01:00
parent bf0bc494b2 c63468fd2f
commit 6b5715386a
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/Event.php
View File

@ -6949,13 +6949,15 @@ class Event extends AppModel
}
$this->Allowedlist = ClassRegistry::init('Allowedlist');
$separator = $exportTool->separator($exportToolParams);
unset($filters['page']);
unset($filters['limit']);
foreach ($eventids_chunked as $chunk) {
$filters['eventid'] = $chunk;
if (!empty($filters['tags']['NOT'])) {
$filters['blockedAttributeTags'] = $filters['tags']['NOT'];
unset($filters['tags']['NOT']);
}
$result = $this->fetchEvent($user, $filters,true);
$result = $this->fetchEvent($user, $filters, true);
$result = $this->Allowedlist->removeAllowedlistedFromArray($result, false);
foreach ($result as $event) {
if ($jobId && $i % 10 == 0) {