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

chg: [period_notification] Improved layout and limit number of events displayed

pull/8579/head
Sami Mokaddem 2022-09-12 12:07:27 +02:00
parent 26faa54731
commit 4e1bf164e9
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/View/Elements/Events/trending_summary.ctp
View File

@ -281,7 +281,6 @@ if (!function_exists('computeLinePositions')) {
$low = '#fee8c8';
$medium = '#f09c8f';
$high = '#bc2f1a';
// $high = '#9d2815';
$periodColorRatio = $clusteredTags[$currentPeriod][$tagName]['occurence'] / $maxValue;
$colorGradient = [];
foreach ($periods as $i => $period) {

23
app/View/Emails/notification_common.ctp
View File

@ -20,6 +20,7 @@ if (empty($this->__vars)) {
}
$default_vars = [
'event_table_include_basescore' => true,
'event_table_max_event_count' => 30,
'additional_taxonomy_event_list' => [
'PAP' => 'PAP:'
],
@ -45,6 +46,9 @@ $tag_color_mapping = [];
$mitre_attack_techniques = [];
$mitre_galaxy_tag_prefix = 'misp-galaxy:mitre-attack-pattern="';
$reportLink = sprintf('%s/users/viewPeriodicSummary/%s', $baseurl, $period);
$eventLink = sprintf('%s/events/index/searchpublished:1/searchPublishTimestamp:%s/searchPublishTimestamp:%s', $baseurl, h($start_date->format('Y-m-d H:i:s')), h($now->format('Y-m-d H:i:s')));
foreach ($events as $event) {
$unique_tag_per_event = [];
$attribute_number += count($event['Attribute']);
@ -232,6 +236,7 @@ array_splice($mitre_attack_techniques, 10);
</tr>
</tbody>
</table>
⮞ <a href="<?= h($reportLink) ?>"><?= __('View this report in MISP') ?></a>
</div>
</div>
<?php endif; ?>
@ -320,7 +325,7 @@ array_splice($mitre_attack_techniques, 10);
<?= $this->fetch('detailed-summary-events'); ?>
<?php else : ?>
<?php if (!empty($events)) : ?>
<h4><?= __('Event list') ?> <small style="color: #999999;"><?= sprintf(' (%s)', count($event)) ?></small></h4>
<h4><?= __('Event list') ?> <small style="color: #999999;"><?= sprintf(' (%s)', count($events)) ?></small></h4>
<table class="table table-condensed">
<thead>
<tr>
@ -339,8 +344,11 @@ array_splice($mitre_attack_techniques, 10);
</tr>
</thead>
<tbody>
<?php foreach ($events as $event) : ?>
<?php foreach ($events as $i => $event) : ?>
<?php
if ($i > $vars['event_table_max_event_count']-1) {
break;
}
$workflowTag = findAndBuildTag($event['EventTag'], 'workflow:', $this);
$analysisHtml = !empty($workflowTag) ? $workflowTag : '';
$tlpTag = findAndBuildTag($event['EventTag'], 'tlp:', $this);
@ -385,6 +393,17 @@ array_splice($mitre_attack_techniques, 10);
<?php else : ?>
<p><?= __('No events.') ?></p>
<?php endif; ?>
<?php if (count($events) > $vars['event_table_max_event_count']) : ?>
⮞ <?=
__n(
'%s event not displayed.',
'%s events not displayed.',
count($events) - $vars['event_table_max_event_count'],
sprintf('<strong>%s</strong>', count($events) - $vars['event_table_max_event_count'])
)
?>
<a href="<?= h($eventLink) ?>"><?= __('View all events in MISP') ?></a>
<?php endif; ?>
<?php endif; ?>
</div>
</div>