mirror of https://github.com/MISP/MISP
Notification on rest add of published events. Fixes #138
parent
cb6482fd54
commit
5011b50c65
|
@ -141,6 +141,7 @@ Configure::write('CyDefSIG.dns', 'false'); // there is a nameserver available
|
||||||
//Configure::write('MISP.welcome_text_top', 'Welcome to the Organisation community\'s'); // used in Events::login before the MISP logo
|
//Configure::write('MISP.welcome_text_top', 'Welcome to the Organisation community\'s'); // used in Events::login before the MISP logo
|
||||||
//Configure::write('MISP.welcome_text_bottom', 'instance'); // used in Events::login after the MISP logo
|
//Configure::write('MISP.welcome_text_bottom', 'instance'); // used in Events::login after the MISP logo
|
||||||
//Configure::write('MISP.welcome_logo', 'organisation'); // used in Events::login to the left of the MISP logo, place a .png file in app/webroot/img with the name specified here. In this case it would be organisation.png
|
//Configure::write('MISP.welcome_logo', 'organisation'); // used in Events::login to the left of the MISP logo, place a .png file in app/webroot/img with the name specified here. In this case it would be organisation.png
|
||||||
|
Configure::write('MISP.disablerestalert', 'true');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The settings below can be used to set additional paths to models, views and controllers.
|
* The settings below can be used to set additional paths to models, views and controllers.
|
||||||
|
|
|
@ -562,6 +562,9 @@ class EventsController extends AppController {
|
||||||
if ($saveResult) {
|
if ($saveResult) {
|
||||||
if (!empty($data['Event']['published']) && 1 == $data['Event']['published']) {
|
if (!empty($data['Event']['published']) && 1 == $data['Event']['published']) {
|
||||||
// do the necessary actions to publish the event (email, upload,...)
|
// do the necessary actions to publish the event (email, upload,...)
|
||||||
|
if ('true' != Configure::read('MISP.disablerestalert')) {
|
||||||
|
$this->__sendAlertEmail($this->Event->getId());
|
||||||
|
}
|
||||||
$this->__publish($this->Event->getId(), $passAlong);
|
$this->__publish($this->Event->getId(), $passAlong);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -2057,7 +2060,6 @@ class EventsController extends AppController {
|
||||||
array_push($temp2, array('(SELECT events.org FROM events WHERE events.id = Attribute.event_id) LIKE' => $org));
|
array_push($temp2, array('(SELECT events.org FROM events WHERE events.id = Attribute.event_id) LIKE' => $org));
|
||||||
$conditionsAttributes['OR'] = $temp2;
|
$conditionsAttributes['OR'] = $temp2;
|
||||||
}
|
}
|
||||||
$conditionsAttributes['AND'] = array('Attribute.to_ids =' => 1);
|
|
||||||
|
|
||||||
// do not expose all the data ...
|
// do not expose all the data ...
|
||||||
$fields = array('Event.id', 'Event.date', 'Event.risk', 'Event.analysis', 'Event.info', 'Event.published', 'Event.uuid');
|
$fields = array('Event.id', 'Event.date', 'Event.risk', 'Event.analysis', 'Event.info', 'Event.published', 'Event.uuid');
|
||||||
|
|
Loading…
Reference in New Issue