mirror of https://github.com/MISP/MISP
Merge branch '2.4' into develop
commit
66532a095c
|
@ -4142,7 +4142,13 @@ class EventsController extends AppController
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->Event->Attribute->fetchRelated($this->Auth->user(), $resultArray);
|
$this->Event->Attribute->fetchRelated($this->Auth->user(), $resultArray);
|
||||||
$typeCategoryMapping = array();
|
$typeCategoryMapping = [
|
||||||
|
'ip-src/ip-dst' => [
|
||||||
|
'Network activity' => 'Network activity',
|
||||||
|
'Payload delivery' => 'Payload delivery',
|
||||||
|
'External analysis' => 'External analysis'
|
||||||
|
],
|
||||||
|
];
|
||||||
foreach ($this->Event->Attribute->categoryDefinitions as $k => $cat) {
|
foreach ($this->Event->Attribute->categoryDefinitions as $k => $cat) {
|
||||||
foreach ($cat['types'] as $type) {
|
foreach ($cat['types'] as $type) {
|
||||||
$typeCategoryMapping[$type][$k] = $k;
|
$typeCategoryMapping[$type][$k] = $k;
|
||||||
|
|
|
@ -2603,6 +2603,7 @@ class UsersController extends AppController
|
||||||
'org_name',
|
'org_name',
|
||||||
'org_uuid',
|
'org_uuid',
|
||||||
'message',
|
'message',
|
||||||
|
'pgp',
|
||||||
'custom_perms',
|
'custom_perms',
|
||||||
'perm_sync',
|
'perm_sync',
|
||||||
'perm_publish',
|
'perm_publish',
|
||||||
|
|
Loading…
Reference in New Issue