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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/3725/head
chrisr3d 2018-09-12 11:57:25 +02:00
parent 65066727e8 a850d39c5c
commit 05bbda5ee5
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/Attribute.php
View File

@ -3633,7 +3633,8 @@ class Attribute extends AppModel
'type' => array('function' => 'set_filter_simple_attribute'),
'tags' => array('function' => 'set_filter_tags'),
'uuid' => array('function' => 'set_filter_uuid'),
'deleted' => array('function' => 'set_filter_deleted')
'deleted' => array('function' => 'set_filter_deleted'),
'timestamp' => array('function' => 'set_filter_timestamp'),
),
'Event' => array(
'eventid' => array('function' => 'set_filter_eventid'),
@ -3643,7 +3644,6 @@ class Attribute extends AppModel
'from' => array('function' => 'set_filter_timestamp'),
'to' => array('function' => 'set_filter_timestamp'),
'last' => array('function' => 'set_filter_timestamp'),
'timestamp' => array('function' => 'set_filter_timestamp'),
'publish_timestamp' => array('function' => 'set_filter_timestamp'),
'org' => array('function' => 'set_filter_org'),
'uuid' => array('function' => 'set_filter_uuid'),

7
app/Model/Event.php
View File

@ -2106,9 +2106,14 @@ class Event extends AppModel
} elseif ($options['filter'] == 'to') {
$conditions['AND']['Event.date <='] = $params['to'];
} else {
if (empty($options['scope'])) {
$scope = 'Attribute';
} else {
$scope = $options['scope'];
}
$filters = array(
'timestamp' => array(
'Event.timestamp'
$scope . '.timestamp'
),
'publish_timestamp' => array(
'Event.publish_timestamp'

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit 6ab7eac3708f3647abc0b1d8f26ac0647204a3c4
Subproject commit 6b7d65f6b3e64f282e5b142b1ad1bd14b211869b

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit b7ebd32485963c410b4274f8051f3236325c4b2f
Subproject commit 7f36c65c549c456e902413d266c93917a4d6b8d9