new: Made the threat_level_id filter for the attribute search more flexible

pull/3161/head
iglocska 2018-04-17 15:17:35 +02:00
parent 9ec1d82ad3
commit 4363778ca2
1 changed files with 14 additions and 1 deletions

View File

@ -1969,7 +1969,20 @@ class AttributesController extends AppController {
if ($published) $conditions['AND'][] = array('Event.published' => $published);
if ($timestamp) $conditions['AND'][] = array('Attribute.timestamp >=' => $timestamp);
if ($event_timestamp) $conditions['AND'][] = array('Event.timestamp >=' => $event_timestamp);
if ($threat_level_id) $conditions['AND'][] = array('Event.threat_level_id' => $threat_level_id);
if ($threat_level_id) {
if (!is_array($threat_level_id)) {
$threat_level_id = array($threat_level_id);
}
$threat_level_lookup = array('high' => 1, 'medium' => 2, 'low' => 3, 'undefined' => 4);
foreach ($threat_level_id as $tldk => $tld) {
if (!is_numeric($tld)) {
if (isset($threat_level_lookup[strtolower($tld)])) {
$threat_level_id[$tldk] = $threat_level_lookup[strtolower($tld)];
}
}
}
$conditions['AND'][] = array('Event.threat_level_id' => $threat_level_id);
}
if ($to_ids) $conditions = $this->Attribute->setToIDSConditions($to_ids, $conditions);
// change the fields here for the attribute export!!!! Don't forget to check for the permissions, since you are not going through fetchevent. Maybe create fetchattribute?
$params = array(