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

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/7953/head
iglocska 2021-11-11 10:45:56 +01:00
parent 86e44ded50 00028760f2
commit c6aec0046b
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Model/Attribute.php
View File

@ -2022,7 +2022,7 @@ class Attribute extends AppModel
// conditions
// order
// group
public function fetchAttributes($user, $options = array(), &$continue = true)
public function fetchAttributes($user, $options = array(), &$continue = true, &$result_count = 0)
{
$params = array(
'conditions' => $this->buildConditions($user),
@ -2210,6 +2210,11 @@ class Attribute extends AppModel
if (!empty($options['includeEventTags'])) {
$eventTags = array();
}
$find_params = $params;
unset($find_params['limit']);
$result_count = $this->find('count', $find_params);
while ($continue) {
if ($loop) {
$params['page'] = $params['page'] + 1;
@ -3354,7 +3359,7 @@ class Attribute extends AppModel
$elementCounter = 0;
$continue = true;
do {
$results = $this->fetchAttributes($user, $params, $continue);
$results = $this->fetchAttributes($user, $params, $continue, $elementCounter);
if (empty($results)) {
break; // nothing found, skip rest
}
@ -3363,7 +3368,6 @@ class Attribute extends AppModel
$results = $this->Sightingdb->attachToAttributes($results, $user);
}
$results = $this->Allowedlist->removeAllowedlistedFromArray($results, true);
$elementCounter += count($results);
foreach ($results as $attribute) {
$handlerResult = $exportTool->handler($attribute, $exportToolParams);
if ($handlerResult !== '') {