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

Change feedback about email notification on sending proposals 

Move from a “Failed for at least one recipient” warning notification
to warn when it was not sent to anyone, which is more interesting for
the user sending the proposal.

Fixes #2158
pull/2161/head
Ángel González 2017-05-05 01:01:37 +02:00
parent 17984f4845
commit 620bb6dad0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/ShadowAttributesController.php
View File

@ -374,7 +374,9 @@ class ShadowAttributesController extends AppController {
if ($successes) {
// list the ones that succeeded
$emailResult = "";
if (!$this->ShadowAttribute->sendProposalAlertEmail($eventId) == false) $emailResult = " but sending out the alert e-mails has failed for at least one recipient.";
if (!$this->ShadowAttribute->sendProposalAlertEmail($eventId) === false) {
$emailResult = " but nobody from the owner organisation could be notified by e-mail.";
}
$this->Session->setFlash(__('The lines' . $successes . ' have been saved' . $emailResult, true));
}
}

11
app/Model/ShadowAttribute.php
View File

@ -420,13 +420,18 @@ class ShadowAttribute extends AppModel {
}
/**
* Sends an email to members of the organization that owns the event
* @param int $id The event id
* @return boolean False if no email at all was sent, true if at least an email was sent
*/
public function sendProposalAlertEmail($id) {
$this->Event->recursive = -1;
$event = $this->Event->read(null, $id);
// If the event has an e-mail lock, return
if ($event['Event']['proposal_email_lock'] == 1) {
return;
return false;
} else {
$this->setProposalLock($id);
}
@ -445,9 +450,9 @@ class ShadowAttribute extends AppModel {
$body .= "A user of another organisation has proposed a change to an event created by you or your organisation. \n\n";
$body .= 'To view the event in question, follow this link: ' . Configure::read('MISP.baseurl') . '/events/view/' . $id . "\n";
$subject = "[" . Configure::read('MISP.org') . " MISP] Proposal to event #" . $id;
$result = true;
$result = false;
foreach ($orgMembers as $user) {
$result = $this->User->sendEmail($user, $body, $body, $subject) && $result;
$result = $this->User->sendEmail($user, $body, $body, $subject) or $result;
}
return $result;
}