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

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

pull/2019/head
iglocska 2017-03-01 15:42:07 +01:00
parent c7f4686ab8 e9992d62db
commit b74548185a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/EventsController.php
View File

@ -3937,7 +3937,7 @@ class EventsController extends AppController {
$importComment = $result['comment'];
}
else {
$importComment = 'Enriched via the ' . $module . ' module';
$importComment = $attribute[0]['Attribute']['value'] . ': Enriched via the ' . $module . ' module';
}
$typeCategoryMapping = array();
foreach ($this->Event->Attribute->categoryDefinitions as $k => $cat) {

2
app/Model/Attribute.php
View File

@ -1710,7 +1710,7 @@ class Attribute extends AppModel {
$intel = array();
foreach ($types as $type) {
//restricting to non-private or same org if the user is not a site-admin.
$conditions['AND'] = array('Attribute.to_ids =' => 1, 'Event.published =' => 1);
$conditions['AND'] = array('Attribute.to_ids' => 1, 'Event.published' => 1);
if ($from) $conditions['AND']['Event.date >='] = $from;
if ($to) $conditions['AND']['Event.date <='] = $to;
if ($last) $conditions['AND']['Event.publish_timestamp >='] = $last;