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

Speed up tag searches, fixes #2407

pull/2584/head
Richard van den Berg 2017-10-20 14:22:22 +02:00
parent c195239d25
commit b5972fb6e7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controller/EventsController.php
View File

@ -407,8 +407,12 @@ class EventsController extends AppController {
'fields' => 'event_id',
'recursive' => -1,
));
foreach ($block as $b) {
$this->paginate['conditions']['AND'][] = array('Event.id !=' => $b['EventTag']['event_id']);
if (!empty($block)) {
$sqlSubQuery = 'Event.id NOT IN (';
foreach ($block as $b) {
$sqlSubQuery .= $b['EventTag']['event_id'] . ',';
}
$this->paginate['conditions']['AND'][] = substr($sqlSubQuery, 0, -1) . ')';
}
if ($filterString != "") $filterString .= "|";
$filterString .= '!' . (isset($tagName['Tag']['name']) ? $tagName['Tag']['name'] : $piece);
@ -438,10 +442,12 @@ class EventsController extends AppController {
'recursive' => -1,
));
if (!empty($allow)) {
$sqlSubQuery = 'Event.id IN (';
foreach ($allow as $a) {
$setOR = true;
$this->paginate['conditions']['AND']['OR'][] = array('Event.id' => $a['EventTag']['event_id']);
$sqlSubQuery .= $a['EventTag']['event_id'] . ',';
}
$this->paginate['conditions']['AND']['OR'][] = substr($sqlSubQuery, 0, -1) . ')';
}
if ($filterString != "") $filterString .= "|";
$filterString .= isset($tagName['Tag']['name']) ? $tagName['Tag']['name'] : $piece;