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

Merge pull request #8654 from JakubOnderka/controller-json-decode 

chg: [internal] Use specific controller version of jsonDecode
pull/8656/head
Jakub Onderka 2022-10-11 08:12:15 +02:00 committed by GitHub
parent 7d7a45c822 7cd1ed76ce
commit e358e13130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/EventReportsController.php
View File

@ -266,7 +266,7 @@ class EventReportsController extends AppController
$report = $this->EventReport->fetchIfAuthorized($this->Auth->user(), $reportId, 'edit', $throwErrors=true, $full=false);
if ($this->request->is('post')) {
$errors = [];
$suggestions = $this->EventReport->jsonDecode($this->data['EventReport']['suggestions']);
$suggestions = $this->_jsonDecode($this->data['EventReport']['suggestions']);
if (!empty($suggestions['content']) && !empty($suggestions['mapping'])) {
$errors = $this->EventReport->applySuggestions($this->Auth->user(), $report, $suggestions['content'], $suggestions['mapping']);
} else {
@ -336,7 +336,7 @@ class EventReportsController extends AppController
{
$event = $this->__canModifyReport($eventId);
if ($this->request->is('post') || $this->request->is('put')) {
$filters = $this->EventReport->jsonDecode($this->data['EventReport']['filters']);
$filters = $this->_jsonDecode($this->data['EventReport']['filters']);
$options['conditions'] = $filters;
$options['conditions'] = array_filter($filters, function($v) {
return $v !== '';

6
app/Controller/EventsController.php
View File

@ -2790,7 +2790,7 @@ class EventsController extends AppController
if (is_numeric($idList) || Validation::uuid($idList)) {
$idList = array($idList);
} else {
$idList = $this->Event->jsonDecode($idList);
$idList = $this->_jsonDecode($idList);
}
}
if (empty($idList)) {
@ -5309,8 +5309,8 @@ class EventsController extends AppController
throw new ForbiddenException(__('You don\'t have permission to do that.'));
}
$resolved_data = $this->Event->jsonDecode($this->request->data['Event']['JsonObject']);
$data = $this->Event->jsonDecode($this->request->data['Event']['data']);
$resolved_data = $this->_jsonDecode($this->request->data['Event']['JsonObject']);
$data = $this->_jsonDecode($this->request->data['Event']['data']);
if (!empty($data['initialObject'])) {
$resolved_data['initialObject'] = $data['initialObject'];
}

2
app/Controller/ServersController.php
View File

@ -503,7 +503,7 @@ class ServersController extends AppController
$this->Flash->error($error_msg);
}
}
$pushRules = $this->Server->jsonDecode($this->request->data['Server']['push_rules']);
$pushRules = $this->_jsonDecode($this->request->data['Server']['push_rules']);
$this->loadModel('Tag');
foreach ($pushRules['tags'] as $operator => $list) {
foreach ($list as $i => $tagName) {

2
app/Controller/UsersController.php
View File

@ -1123,7 +1123,7 @@ class UsersController extends AppController
}
if ($this->request->is('post') || $this->request->is('put')) {
$jsonIds = $this->request->data['User']['user_ids'];
$ids = $this->User->jsonDecode($jsonIds);
$ids = $this->_jsonDecode($jsonIds);
$conditions = ['User.id' => $ids];
if (!$this->_isSiteAdmin()) {
$conditions['User.org_id'] = $this->Auth->user('org_id');