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

Merge branch 'feature/searchapi' into develop

pull/217/head
iglocska 2013-09-27 10:07:41 +02:00
parent 08252db90c 1deddf0075
commit 1a9dc219c7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/AttributesController.php
View File

@ -1098,9 +1098,9 @@ class AttributesController extends AppController {
$elements = explode('&&', ${$parameters[$k]});
foreach($elements as $v) {
if (substr($v, 0, 1) == '!') {
$subcondition['AND'][] = array('Attribute.value NOT LIKE' => '%'.substr($v, 1).'%');
$subcondition['AND'][] = array('Attribute.' . $parameters[$k] . ' NOT LIKE' => '%'.substr($v, 1).'%');
} else {
$subcondition['OR'][] = array('Attribute.value LIKE' => '%'.$v.'%');
$subcondition['OR'][] = array('Attribute.' . $parameters[$k] . ' LIKE' => '%'.$v.'%');
}
}
array_push ($conditions['AND'], $subcondition);

5
app/Controller/EventsController.php
View File

@ -2200,9 +2200,9 @@ class EventsController extends AppController {
$elements = explode('&&', ${$parameters[$k]});
foreach($elements as $v) {
if (substr($v, 0, 1) == '!') {
$subcondition['AND'][] = array('Attribute.value NOT LIKE' => '%'.substr($v, 1).'%');
$subcondition['AND'][] = array('Attribute.' . $parameters[$k] . ' NOT LIKE' => '%'.substr($v, 1).'%');
} else {
$subcondition['OR'][] = array('Attribute.value LIKE' => '%'.$v.'%');
$subcondition['OR'][] = array('Attribute.' . $parameters[$k] . ' LIKE' => '%'.$v.'%');
}
}
array_push ($conditions['AND'], $subcondition);
@ -2224,7 +2224,6 @@ class EventsController extends AppController {
'conditions' => $conditions,
'fields' => array('Attribute.event_id'),
);
$attributes = $this->Attribute->find('all', $params);
$eventIds = array();
foreach ($attributes as $attribute) {