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

chg: [user:periodic_notification] Removed support of published events

pull/8575/head
Sami Mokaddem 2022-09-08 10:55:50 +02:00
parent fb5e097a96
commit 943cd3acb0
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Model/User.php
View File

@ -1651,7 +1651,7 @@ class User extends AppModel
public function extractPeriodicSettingForUser($user): array
{
$filter_names = ['orgc_id', 'published', 'distribution', 'sharing_group_id', 'event_info', 'tags'];
$filter_names = ['orgc_id', 'distribution', 'sharing_group_id', 'event_info', 'tags'];
if (is_numeric($user)) {
$user = $this->find('first', [
'recursive' => -1,
@ -1701,7 +1701,6 @@ class User extends AppModel
}
$notification_filters = [
'orgc_id' => $periodic_settings['orgc_id'] ?? [],
'published' => $periodic_settings['published'] ?? '',
'distribution' => $periodic_settings['distribution'] ?? '',
'sharing_group_id' => $periodic_settings['distribution'] != 4 ? '' : ($periodic_settings['sharing_group_id'] ?? []),
'event_info' => $periodic_settings['event_info'] ?? '',
@ -1798,14 +1797,12 @@ class User extends AppModel
{
$filters = [
'last' => $this->__genTimerangeFilter($period),
'published' => true,
'includeBaseScoresOnEvent' => true,
];
if (!empty($period_filters['orgc_id'])) {
$filters['orgc_id'] = $period_filters['orgc_id'];
}
if (!empty($period_filters['published'])) {
$filters['published'] = true;
}
if (!empty($period_filters['distribution'])) {
$filters['distribution'] = intval($period_filters['distribution']);
}

6
app/View/Users/notification_settings.ctp
View File

@ -30,12 +30,6 @@ echo $this->element('genericElements/Form/genericForm', [
'multiple' => true,
'picker' => true,
],
[
'field' => 'periodic_settings.published',
'label' => __('Only include published Events'),
'class' => 'input',
'type' => 'checkbox'
],
[
'field' => 'periodic_settings.distribution',
'label' => __('Distribution level'),