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

fix: Various cleanups of the event preview via feeds

pull/3064/head
iglocska 2018-03-23 10:59:53 +01:00
parent ddf481042f
commit 7af7e334f8
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/View/Elements/Feeds/View/row_object_reference.ctp
View File

@ -1,6 +1,6 @@
<span class="bold"><?php echo __('References: ');?></span>
<?php
$refCount = count($object['ObjectReference']);
$refCount = empty($object['ObjectReference']) ? 0 : count($object['ObjectReference']);
echo $refCount . ' ';
if (!empty($object['ObjectReference'])):
?>
@ -10,25 +10,25 @@
?>
<div id="Object_<?php echo $object['uuid']; ?>_references_collapsible" class="collapse">
<?php
foreach ($object['ObjectReference'] as $reference):
if (!empty($reference['Object'])) {
$uuid = $reference['Object']['uuid'];
$output = ' (' . $reference['Object']['name'] . ': ' . $reference['Object']['name'] . ')';
$objectType = 'Object';
} else {
$uuid = $reference['Attribute']['uuid'];
$output = ' (' . $reference['Attribute']['category'] . '/' . $reference['Attribute']['type'] . ': "' . $reference['Attribute']['value'] . '")';
$objectType = 'Attribute';
}
$uuid = empty($reference['Object']) ? $reference['Attribute']['uuid'] : $reference['Object']['uuid'];
$idref = $reference['uuid'];
if (!empty($object['ObjectReference'])):
foreach ($object['ObjectReference'] as $reference):
if (!empty($reference['Object'])) {
$uuid = $reference['Object']['uuid'];
$output = ' (' . $reference['Object']['name'] . ': ' . $reference['Object']['name'] . ')';
$objectType = 'Object';
} else {
$uuid = $reference['referenced_uuid'];
$output = '';
$objectType = 'Attribute';
}
$uuid = $reference['referenced_uuid'];
$idref = $reference['uuid'];
?>
&nbsp;&nbsp;
<div class="bold white useCursorPointer">
<?php echo h($reference['relationship_type']) . ' ' . $objectType . ' ' . $reference['referenced_uuid'] . h($output);?>
</div>
<br />
<div class="bold white useCursorPointer">
&nbsp;&nbsp;<?php echo h($reference['relationship_type']) . ' ' . $objectType . ' ' . $reference['referenced_uuid'] . h($output);?>
</div>
<?php
endforeach;
endforeach;
endif;
?>
</div>

10
app/View/Elements/Feeds/View/row_object_referenced_by.ctp
View File

@ -4,11 +4,11 @@
echo $refCount;
if (!empty($object['referenced_by'])):
?>
<span class="fa fa-expand useCursorPointer" title="<?php echo __('Expand or Collapse');?>" role="button" tabindex="0" aria-label="<?php echo __('Expand or Collapse');?>" data-toggle="collapse" data-target="#Object_<?php echo h($object['id']); ?>_referenced_by_collapsible"></span>
<span class="fa fa-expand useCursorPointer" title="<?php echo __('Expand or Collapse');?>" role="button" tabindex="0" aria-label="<?php echo __('Expand or Collapse');?>" data-toggle="collapse" data-target="#Object_<?php echo h($object['uuid']); ?>_referenced_by_collapsible"></span>
<?php
endif;
?>
<div id="Object_<?php echo $object['id']; ?>_referenced_by_collapsible" class="collapse">
<div id="Object_<?php echo $object['uuid']; ?>_referenced_by_collapsible" class="collapse">
<?php
foreach ($object['referenced_by'] as $type => $reference):
foreach ($reference as $ref):
@ -21,9 +21,9 @@
}
?>
&nbsp;&nbsp;
<a class="bold white useCursorPointer" onClick="pivotObjectReferences('<?php echo h($currentUri); ?>', '<?php echo $uuid; ?>')">
<?php echo h($ref['relationship_type']) . ' ' . ucfirst($type) . ' ' . h($ref['id']) . h($output);?>
</a>
<span class="bold white useCursorPointer">
<?php echo h($ref['relationship_type']) . ' ' . ucfirst($type) . ' ' . h($output);?>
</span>
<br />
<?php
endforeach;