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

chg: [internal] Small optimisations

pull/7907/head
Jakub Onderka 2021-10-29 17:36:53 +02:00
parent d99813bdc0
commit 5cd1fe3723
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Lib/Tools/CustomPaginationTool.php
View File

@ -99,7 +99,6 @@ class CustomPaginationTool
foreach ($sortArray as $k => $sortedElement) {
$sortArray[$k] = $items[$k];
}
$items = array();
$items = $sortArray;
}
if (!$escapeReindex) {
@ -113,11 +112,12 @@ class CustomPaginationTool
$params = $this->createPaginationRules($items, $options, $model, $sort, $focusKey);
$items = $this->sortArray($items, $params, $escapeReindex);
if (!empty($params['options']['focus'])) {
$focus = $params['options']['focus'];
foreach ($items as $k => $item) {
if ($item[$focusKey] == $params['options']['focus']) {
if ($item[$focusKey] === $focus) {
$params['page'] = 1 + intval(floor($k / $params['limit']));
$params['current'] = 1 + ($params['page'] - 1) * $params['limit'];
continue;
break;
}
}
unset($params['options']['focus']);

23
app/Model/Event.php
View File

@ -5420,22 +5420,18 @@ class Event extends AppModel
unset($event['Object']);
}
$event['objects'] = $objects;
$referencedByArray = array();
foreach ($event['objects'] as $object) {
if (!in_array($object['objectType'], array('attribute', 'object'))) {
continue;
}
if (!empty($object['ObjectReference'])) {
foreach ($objects as $object) {
$objectType = $object['objectType'];
if (($objectType === 'attribute' || $objectType === 'object') && !empty($object['ObjectReference'])) {
foreach ($object['ObjectReference'] as $reference) {
if (isset($reference['referenced_uuid'])) {
$referencedByArray[$reference['referenced_uuid']][$object['objectType']][] = array(
$referencedByArray[$reference['referenced_uuid']][$objectType][] = array(
'meta-category' => $object['meta-category'],
'name' => $object['name'],
'uuid' => $object['uuid'],
'id' => isset($object['id']) ? $object['id'] : 0,
'object_type' => $object['objectType'],
'object_type' => $objectType,
'relationship_type' => $reference['relationship_type']
);
}
@ -5447,15 +5443,16 @@ class Event extends AppModel
if ($all) {
$passedArgs['page'] = 0;
}
$params = $customPagination->applyRulesOnArray($event['objects'], $passedArgs, 'events', 'category');
foreach ($event['objects'] as $k => $object) {
$params = $customPagination->applyRulesOnArray($objects, $passedArgs, 'events', 'category');
foreach ($objects as $k => $object) {
if (isset($referencedByArray[$object['uuid']])) {
foreach ($referencedByArray[$object['uuid']] as $objectType => $references) {
$event['objects'][$k]['referenced_by'][$objectType] = $references;
$objects[$k]['referenced_by'][$objectType] = $references;
}
}
}
$params['total_elements'] = count($event['objects']);
$event['objects'] = $objects;
$params['total_elements'] = count($objects);
return $params;
}