mirror of https://github.com/MISP/MISP
Merge branch '2.4' of github.com:MISP/MISP into 2.4
commit
61d7bca63f
|
@ -1838,12 +1838,12 @@ class UsersController extends AppController
|
|||
}
|
||||
}
|
||||
|
||||
public function verifyGPG()
|
||||
public function verifyGPG($full = false)
|
||||
{
|
||||
if (!self::_isSiteAdmin()) {
|
||||
throw new NotFoundException();
|
||||
}
|
||||
$user_results = $this->User->verifyGPG();
|
||||
$user_results = $this->User->verifyGPG($full);
|
||||
$this->set('users', $user_results);
|
||||
}
|
||||
|
||||
|
|
|
@ -472,6 +472,7 @@ class User extends AppModel
|
|||
$currentTimestamp = time();
|
||||
$temp = $gpg->importKey($user['User']['gpgkey']);
|
||||
$key = $gpg->getKeys($temp['fingerprint']);
|
||||
$result[5] = $temp['fingerprint'];
|
||||
$subKeys = $key[0]->getSubKeys();
|
||||
$sortedKeys = array('valid' => 0, 'expired' => 0, 'noEncrypt' => 0);
|
||||
foreach ($subKeys as $subKey) {
|
||||
|
|
|
@ -4,11 +4,13 @@
|
|||
<?php foreach ($users as $k => $user) {
|
||||
echo '<a href="'.$baseurl.'/admin/users/view/' . $k . '">' . $k . ' (' . h($user[1]) . ')</a>:';
|
||||
if (isset($user[0])) {
|
||||
echo '-> <span style="color:red;"><span style="font-weight:bold">Invalid.</span> (' . h($user[2]) . ')</span><br />';
|
||||
echo '-> <span style="color:red;"><span style="font-weight:bold">Invalid.</span> (' . h($user[2]) . ')</span>';
|
||||
} else {
|
||||
echo '-> <span style="color:green;">OK</span><br />';
|
||||
echo '-> <span style="color:green;">OK</span>';
|
||||
}
|
||||
echo '------------------------------------------------------------------------------<br />';
|
||||
echo ' (' . $user[5] . ')';
|
||||
|
||||
echo '<br />------------------------------------------------------------------------------<br />';
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
|
|
Loading…
Reference in New Issue