mirror of https://github.com/MISP/MISP
Merge branch 'develop' of github.com:MISP/MISP into develop
commit
0d6d3cb980
|
@ -3343,16 +3343,16 @@ class Event extends AppModel
|
|||
if (empty($this->eventBlockRule)) {
|
||||
return true;
|
||||
}
|
||||
if (!empty($rules['tags'])) {
|
||||
if (!is_array($rules['tags'])) {
|
||||
$rules['tags'] = [$rules['tags']];
|
||||
if (!empty($this->eventBlockRule['tags'])) {
|
||||
if (!is_array($this->eventBlockRule['tags'])) {
|
||||
$this->eventBlockRule['tags'] = [$this->eventBlockRule['tags']];
|
||||
}
|
||||
$eventTags = Hash::extract($event, 'Event.Tag.{n}.name');
|
||||
if (empty($eventTags)) {
|
||||
$eventTags = Hash::extract($event, 'Event.EventTag.{n}.Tag.name');
|
||||
}
|
||||
if (!empty($eventTags)) {
|
||||
foreach ($rules['tags'] as $blockTag) {
|
||||
foreach ($this->eventBlockRule['tags'] as $blockTag) {
|
||||
if (in_array($blockTag, $eventTags)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit bfda561f5f29a8cca573e22789fb58252ad36c93
|
||||
Subproject commit cf4e5c8cf0f49074193f5103a833168aeb5e2ed7
|
|
@ -1 +1 @@
|
|||
Subproject commit fc5599114f92926838b519f322b81a061039fe0e
|
||||
Subproject commit faee7c9dff59b61942f53aebee44ee0c59d8ca4f
|
Loading…
Reference in New Issue