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

chg: [internal] Use short isset

pull/8649/head
Jakub Onderka 2022-10-08 13:41:33 +02:00
parent 0cb3e58881
commit 3e970ad6a6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Controller/AppController.php
View File

@ -294,10 +294,10 @@ class AppController extends Controller
$this->set('isAclTemplate', $role['perm_template']);
$this->set('isAclGalaxyEditor', !empty($role['perm_galaxy_editor']));
$this->set('isAclSharingGroup', $role['perm_sharing_group']);
$this->set('isAclSighting', isset($role['perm_sighting']) ? $role['perm_sighting'] : false);
$this->set('isAclZmq', isset($role['perm_publish_zmq']) ? $role['perm_publish_zmq'] : false);
$this->set('isAclKafka', isset($role['perm_publish_kafka']) ? $role['perm_publish_kafka'] : false);
$this->set('isAclDecaying', isset($role['perm_decaying']) ? $role['perm_decaying'] : false);
$this->set('isAclSighting', $role['perm_sighting'] ?? false);
$this->set('isAclZmq', $role['perm_publish_zmq'] ?? false);
$this->set('isAclKafka', $role['perm_publish_kafka'] ?? false);
$this->set('isAclDecaying', $role['perm_decaying'] ?? false);
$this->set('aclComponent', $this->ACL);
$this->userRole = $role;
@ -543,7 +543,7 @@ class AppController extends Controller
// Check if auth key is not expired. Make sense when Security.authkey_keep_session is enabled.
if (isset($user['authkey_expiration']) && $user['authkey_expiration']) {
$time = isset($_SERVER['REQUEST_TIME']) ? $_SERVER['REQUEST_TIME'] : time();
$time = $_SERVER['REQUEST_TIME'] ?? time();
if ($user['authkey_expiration'] < $time) {
if ($this->_shouldLog('expired:' . $user['authkey_id'])) {
$this->Log = ClassRegistry::init('Log');
@ -644,7 +644,7 @@ class AppController extends Controller
// Log key usage if enabled
if (isset($user['authkey_id']) && Configure::read('MISP.log_user_ips_authkeys')) {
// Use request time if defined
$time = isset($_SERVER['REQUEST_TIME']) ? $_SERVER['REQUEST_TIME'] : time();
$time = $_SERVER['REQUEST_TIME'] ?? time();
$hashKey = date("Y-m-d", $time) . ":$remoteAddress";
$pipe->hIncrBy("misp:authkey_usage:{$user['authkey_id']}", $hashKey, 1);
// delete after one year of inactivity
@ -792,7 +792,7 @@ class AppController extends Controller
return $this->RestResponse->viewData($this->ACL->$debugType($content), 'json');
}
/*
/**
* Setup & validate the database connection configuration
* @throws Exception if the configured database is not supported.
*/