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

Merge branch '2.4' into develop

pull/7024/head
iglocska 2021-02-11 17:48:23 +01:00
parent 71ce6d031b 4e3d97f9e0
commit 6850870846
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AppController.php
View File

@ -25,7 +25,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
private $__queryVersion = '122';
private $__queryVersion = '123';
public $pyMispVersion = '2.4.138';
public $phpmin = '7.2';
public $phprec = '7.4';

3
app/View/AuthKeys/view.ctp
View File

@ -10,6 +10,9 @@ if (isset($keyUsage)) {
$dateAsString = date('Y-m-d', $date);
$keyUsageCsv .= $dateAsString . ',' . (isset($keyUsage[$dateAsString]) ? $keyUsage[$dateAsString] : 0) . '\n';
}
} else {
$lastUsed = null;
$uniqueIps = null;
}
echo $this->element(

4
app/webroot/js/misp.js
View File

@ -3572,10 +3572,10 @@ function testConnection(id) {
html += '<span class="red bold" title="Authentication failed because the sync user on the remote has not accepted the terms of use. Log into the remote MISP to rectify this.">Terms not accepted</span>';
break;
case 7:
html += '<span class="red bold" title="The user account on the remote instance is not a sync user.">Remote user not a sync user</span>';
html += '<span class="orange bold" title="The user account on the remote instance is not a sync user.">Remote user not a sync user, only pulling events is available.</span>';
break;
case 8:
html += '<span class="orange bold" title="The user account on the remote instance is only a sightings user.">Remote user not a sync user, syncing sightings only</span>';
html += '<span class="orange bold" title="The user account on the remote instance is only a sightings user.">Remote user not a sync user, only pulling events is available. Pushing availale for sightings only</span>';
break;
}