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

rebase continue

pull/5974/head
Vito Piserchia 2020-08-17 17:28:04 +02:00
parent d2f424e416
commit d649257a15
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/GalaxiesController.php
View File

@ -155,14 +155,14 @@ class GalaxiesController extends AppController
$items = array(
array(
'name' => __('All clusters'),
'value' => $baseurl . "/galaxies/selectCluster/" . h($target_id) . '/' . h($target_type) . '/0'. '/local:' . $local
'value' => $this->baseurl . "/galaxies/selectCluster/" . h($target_id) . '/' . h($target_type) . '/0'. '/local:' . $local
)
);
foreach ($galaxies as $galaxy) {
if (!isset($galaxy['Galaxy']['kill_chain_order'])) {
$items[] = array(
'name' => h($galaxy['Galaxy']['name']),
'value' => $baseurl . "/galaxies/selectCluster/" . $target_id . '/' . $target_type . '/' . $galaxy['Galaxy']['id'] . '/local:' . $local,
'value' => $this->baseurl . "/galaxies/selectCluster/" . $target_id . '/' . $target_type . '/' . $galaxy['Galaxy']['id'] . '/local:' . $local,
'template' => array(
'preIcon' => 'fa-' . $galaxy['Galaxy']['icon'],
'name' => $galaxy['Galaxy']['name'],
@ -205,12 +205,12 @@ class GalaxiesController extends AppController
$items = array();
$items[] = array(
'name' => __('All namespaces'),
'value' => $baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/0' . '/local:' . $local
'value' => $this->baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/0' . '/local:' . $local
);
foreach ($namespaces as $namespace) {
$items[] = array(
'name' => $namespace,
'value' => $baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/' . $namespace . '/local:' . $local
'value' => $this->baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/' . $namespace . '/local:' . $local
);
}

4
app/Controller/ObjectTemplatesController.php
View File

@ -29,12 +29,12 @@ class ObjectTemplatesController extends AppController
$items = array();
$items[] = array(
'name' => __('All Objects'),
'value' => $baseurl . "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . "0"
'value' => $this->baseurl . "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . "0"
);
foreach($metas as $meta) {
$items[] = array(
'name' => $meta,
'value' => $baseurl . "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . h($meta)
'value' => $this->baseurl . "/ObjectTemplates/objectChoice/" . h($event_id) . "/" . h($meta)
);
}

2
app/Controller/ServersController.php
View File

@ -1745,7 +1745,7 @@ class ServersController extends AppController
'recommendBackup' => false,
'exitOnError' => false,
'requirements' => '',
'url' => $baseurl . '/'
'url' => $this->baseurl . '/'
);
foreach($actions as $id => $action) {
foreach($default_fields as $field => $value) {

4
app/Controller/ShadowAttributesController.php
View File

@ -171,7 +171,7 @@ class ShadowAttributesController extends AppController
$response['check_publish'] = true;
$this->set('name', $response['success']);
$this->set('message', $response['success']);
$this->set('url', $baseurl . '/shadow_attributes/accept/' . $id);
$this->set('url', $this->baseurl . '/shadow_attributes/accept/' . $id);
$this->set('_serialize', array('name', 'message', 'url'));
} else {
throw new MethodNotAllowedException($response['errors']);
@ -223,7 +223,7 @@ class ShadowAttributesController extends AppController
if ($this->_isRest()) {
$this->set('name', 'Proposal discarded.');
$this->set('message', 'Proposal discarded.');
$this->set('url', $baseurl . '/shadow_attributes/discard/' . $id);
$this->set('url', $this->baseurl . '/shadow_attributes/discard/' . $id);
$this->set('_serialize', array('name', 'message', 'url'));
} else {
$this->autoRender = false;

4
app/Controller/TagsController.php
View File

@ -364,7 +364,7 @@ class TagsController extends AppController
if ($this->_isRest()) {
$this->set('name', 'Tag deleted.');
$this->set('message', 'Tag deleted.');
$this->set('url', $baseurl . '/tags/delete/' . $id);
$this->set('url', $this->baseurl . '/tags/delete/' . $id);
$this->set('_serialize', array('name', 'message', 'url'));
}
$this->Flash->success(__('Tag deleted'));
@ -589,7 +589,7 @@ class TagsController extends AppController
);
$items[] = array(
'name' => __('All Tags'),
'value' => $baseurl . "/tags/selectTag/" . h($id) . "/all/" . h($scope) . $localFlag
'value' => $this->baseurl . "/tags/selectTag/" . h($id) . "/all/" . h($scope) . $localFlag
);
$this->loadModel('Taxonomy');