mirror of https://github.com/MISP/MISP
Fixed an issue where PGP keys that are set to never expire show up as expired
parent
3a540542ed
commit
69031ab35e
|
@ -1 +1 @@
|
||||||
{"major":2, "minor":3, "hotfix":156}
|
{"major":2, "minor":3, "hotfix":157}
|
||||||
|
|
|
@ -393,7 +393,8 @@ class User extends AppModel {
|
||||||
$sortedKeys = array('valid' => 0, 'expired' => 0, 'noEncrypt' => 0);
|
$sortedKeys = array('valid' => 0, 'expired' => 0, 'noEncrypt' => 0);
|
||||||
foreach ($subKeys as $subKey) {
|
foreach ($subKeys as $subKey) {
|
||||||
$issue = false;
|
$issue = false;
|
||||||
if ($currentTimestamp > $subKey->getExpirationDate()) {
|
$expiration = $subKey->getExpirationDate();
|
||||||
|
if ($expiration != 0 && $currentTimestamp > $expiration) {
|
||||||
$sortedKeys['expired']++;
|
$sortedKeys['expired']++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue