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

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

pull/8530/head
iglocska 2022-08-04 19:09:11 +02:00
parent 243208e4eb 412dcd7b10
commit 35b4803400
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit cd4b5d533b68de19b714be7f83f231640404f0bf
Subproject commit 0859c3d3cea041f55810a72df613c6352b1d6b0c

2
app/Controller/AppController.php
View File

@ -36,7 +36,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '143';
public $pyMispVersion = '2.4.159';
public $pyMispVersion = '2.4.160';
public $phpmin = '7.2';
public $phprec = '7.4';
public $phptoonew = '8.0';

4
app/Model/Workflow.php
View File

@ -562,9 +562,9 @@ class Workflow extends AppModel
$userForWorkflow = [
'email' => 'SYSTEM',
'id' => 0,
'org_id' => $hostOrg['Org']['id'],
'org_id' => $hostOrg['Organisation']['id'],
'Role' => ['perm_site_admin' => 1],
'Organisation' => $hostOrg['Org']
'Organisation' => $hostOrg['Organisation']
];
} else {
$this->User = ClassRegistry::init('User');

13
app/View/Workflows/triggers.ctp
View File

@ -42,10 +42,15 @@
'<span class="label %s">%s %s</span>',
!empty($row['disabled']) ? '' : 'label-' . $trigger_overhead_mapping[$row['trigger_overhead']]['class'],
h($trigger_overhead_mapping[$row['trigger_overhead']]['text']),
empty($row['trigger_overhead_message']) ? '' : sprintf('<i class="fa-fw %s" title="%s" data-placement="right" data-toggle="tooltip"></i>', $this->FontAwesome->getClass('question-circle'), sprintf('%s%s',
!empty($row['disabled']) ? sprintf('[%s]' . PHP_EOL, __('Trigger not enabled')) : '',
h($row['trigger_overhead_message'])),
)
empty($row['trigger_overhead_message']) ? '' :
sprintf(
'<i class="fa-fw %s" title="%s" data-placement="right" data-toggle="tooltip"></i>',
$this->FontAwesome->getClass('question-circle'),
sprintf('%s%s',
!empty($row['disabled']) ? sprintf('[%s]' . PHP_EOL, __('Trigger not enabled')) : '',
h($row['trigger_overhead_message'])
)
)
);
}
],