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/8965/head
iglocska 2023-03-17 15:51:29 +01:00
parent 9a153f9a3d aa9dffb03f
commit 7614123ed6
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controller/GalaxiesController.php
View File

@ -22,8 +22,16 @@ class GalaxiesController extends AppController
public function index() public function index()
{ {
$aclConditions = array(); $aclConditions = array();
$filters = $this->IndexFilter->harvestParameters(array('value', 'enabled')); $filterData = array(
$searchConditions = array(); 'request' => $this->request,
'named_params' => $this->params['named'],
'paramArray' => ['value', 'enabled'],
'ordered_url_params' => [],
'additional_delimiters' => PHP_EOL
);
$exception = false;
$filters = $this->_harvestParameters($filterData, $exception);
$searchConditions = [];
if (empty($filters['value'])) { if (empty($filters['value'])) {
$filters['value'] = ''; $filters['value'] = '';
} else { } else {

1
app/Controller/GalaxyClustersController.php
View File

@ -37,6 +37,7 @@ class GalaxyClustersController extends AppController
public function index($galaxyId) public function index($galaxyId)
{ {
$galaxyId = $this->Toolbox->findIdByUuid($this->GalaxyCluster->Galaxy, $galaxyId);
$filters = $this->IndexFilter->harvestParameters(array('context', 'searchall')); $filters = $this->IndexFilter->harvestParameters(array('context', 'searchall'));
$aclConditions = $this->GalaxyCluster->buildConditions($this->Auth->user()); $aclConditions = $this->GalaxyCluster->buildConditions($this->Auth->user());
$contextConditions = array(); $contextConditions = array();