mirror of https://github.com/MISP/MISP
Merge branch '2.4' into develop
commit
7614123ed6
|
@ -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 {
|
||||||
|
|
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue