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/1774/head
iglocska 2016-12-19 17:36:44 +01:00
parent 37d9e3b276 2f04ee8e6c
commit 3661be08cc
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Config/config.default.php
View File

@ -16,6 +16,10 @@ $config = array(
'footermidright' => '',
'org' => 'ORGNAME',
'showorg' => true,
'threatlevel_in_email_subject' => true,
'email_subject_TLP_string' => 'TLP Amber',
'email_subject_tag' => 'tlp',
'email_subject_include_tag_name' => true,
'background_jobs' => true,
'cached_attachments' => true,
'email' => 'email@address.com',

6
app/Model/Event.php
View File

@ -1617,7 +1617,11 @@ class Event extends AppModel {
break;
}
}
$subject = "[" . Configure::read('MISP.org') . " MISP] Event " . $id . " - " . $subject . $event[0]['ThreatLevel']['name'] . " - ".$subjMarkingString;
$threatLevel = $event[0]['ThreatLevel']['name'] . " - ";
if(Configure::read('MISP.threatlevel_in_email_subject') === false) {
$threatLevel = '';
}
$subject = "[" . Configure::read('MISP.org') . " MISP] Event " . $id . " - " . $subject . $threatLevel . $subjMarkingString;
// Initialise the Job class if we have a background process ID
// This will keep updating the process's progress bar

8
app/Model/Server.php
View File

@ -265,6 +265,14 @@ class Server extends AppModel {
'test' => 'testBool',
'type' => 'boolean',
),
'threatlevel_in_email_subject' => array(
'level' => 2,
'description' => 'Put the event threat level in the notification E-mail subject.',
'value' => true,
'errorMessage' => '',
'test' => 'testBool',
'type' => 'boolean',
),
'email_subject_TLP_string' => array(
'level' => 2,
'description' => 'This is the TLP string for e-mails when email_subject_tag is not found.',

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit 1d957da2245203f9fa9f4d01b71d6f62c11b4442
Subproject commit 40d96b6f2d19afc74eeb0ee3b10bd6a0b76da5fe