tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-05-29 Hirofumi Kosaka <kosaka@rworks.jp> 

* include/functions_api.php: added "event_type" to the
	get_events filters. Some fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6355 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2012-05-29 08:55:51 +00:00
parent f313e1a1e2
commit 652dee3801
2 changed files with 51 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-05-29 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: added "event_type" to the
get_events filters. Some fixes.
2012-05-28 Sancho Lerena <slerena@artica.es> 2012-05-28 Sancho Lerena <slerena@artica.es>
* godmode/agentes/module_manager_editor_plugin.php: A bit more * godmode/agentes/module_manager_editor_plugin.php: A bit more

57
pandora_console/include/functions_api.php
View File

@ -3769,18 +3769,18 @@ function set_enable_disable_user ($id, $thrash2, $other, $thrash3) {
function otherParameter2Filter($other, $return_as_array = false) { function otherParameter2Filter($other, $return_as_array = false) {
$filter = array(); $filter = array();
if (($other['data'][1] != null) && ($other['data'][1] != -1) && ($other['data'][1] != '')) { if (isset($other['data'][1]) && ($other['data'][1] != -1) && ($other['data'][1] != '')) {
$filter['criticity'] = $other['data'][1]; $filter['criticity'] = $other['data'][1];
} }
$idAgent = null; $idAgent = null;
if ($other['data'][2] != '') { if (isset($other['data'][2]) && $other['data'][2] != '') {
$idAgent = agents_get_agent_id($other['data'][2]); $idAgent = agents_get_agent_id($other['data'][2]);
$filter['id_agente'] = $idAgent; $filter['id_agente'] = $idAgent;
} }
$idAgentModulo = null; $idAgentModulo = null;
if ($other['data'][3] != '') { if (isset($other['data'][3]) && $other['data'][3] != '') {
$filterModule = array('nombre' => $other['data'][3]); $filterModule = array('nombre' => $other['data'][3]);
if ($idAgent != null) { if ($idAgent != null) {
$filterModule['id_agente'] = $idAgent; $filterModule['id_agente'] = $idAgent;
@ -3791,7 +3791,7 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if ($other['data'][4] != '') { if (isset($other['data'][4]) && $other['data'][4] != '') {
$idTemplate = db_get_value_filter('id', 'talert_templates', array('name' => $other['data'][4])); $idTemplate = db_get_value_filter('id', 'talert_templates', array('name' => $other['data'][4]));
if ($idTemplate !== false) { if ($idTemplate !== false) {
if ($idAgentModulo != null) { if ($idAgentModulo != null) {
@ -3803,7 +3803,7 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if ($other['data'][5] != '') { if (isset($other['data'][5]) && $other['data'][5] != '') {
$filter['id_usuario'] = $other['data'][5]; $filter['id_usuario'] = $other['data'][5];
} }
@ -3812,7 +3812,7 @@ function otherParameter2Filter($other, $return_as_array = false) {
$filterString = '1 = 1'; $filterString = '1 = 1';
} }
if (($other['data'][6] != null) && ($other['data'][6] != -1)) { if (isset($other['data'][6]) && ($other['data'][6] != '') && ($other['data'][6] != -1)) {
if ($return_as_array) { if ($return_as_array) {
$filter['utimestamp']['>'] = $other['data'][6]; $filter['utimestamp']['>'] = $other['data'][6];
} }
@ -3821,7 +3821,7 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if (($other['data'][7] != null) && ($other['data'][7] != -1)) { if (isset($other['data'][7]) && ($other['data'][7] != '') && ($other['data'][7] != -1)) {
if ($return_as_array) { if ($return_as_array) {
$filter['utimestamp']['<'] = $other['data'][7]; $filter['utimestamp']['<'] = $other['data'][7];
} }
@ -3830,12 +3830,12 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if (($other['data'][8] != null) && ($other['data'][8] != -1)) { if (isset($other['data'][8]) && ($other['data'][8] != '')) {
if ($return_as_array) { if ($return_as_array) {
$filter['estado'] = $other['data'][8]; $filter['estado'] = $other['data'][8];
} }
else { else {
$estado = (int)$other[8]; $estado = (int)$other['data'][8];
if ($estado >= 0) { if ($estado >= 0) {
$filterString .= ' AND estado = ' . $estado; $filterString .= ' AND estado = ' . $estado;
@ -3843,16 +3843,16 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if (($other['data'][9] != null) && ($other['data'][9] != "")) { if (isset($other['data'][9]) && ($other['data'][9] != '')) {
if ($return_as_array) { if ($return_as_array) {
$filter['evento'] = $other['data'][9]; $filter['evento'] = $other['data'][9];
} }
else { else {
$filterString .= ' AND evento like "%' . $other[9] . '%"'; $filterString .= ' AND evento like "%' . $other['data'][9] . '%"';
} }
} }
if ($other['data'][10] != null) { if (isset($other['data'][10]) && ($other['data'][10] != '')) {
if ($return_as_array) { if ($return_as_array) {
$filter['limit'] = $other['data'][10]; $filter['limit'] = $other['data'][10];
} }
@ -3861,7 +3861,7 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if ($other['data'][11] != null) { if (isset($other['data'][11]) && ($other['data'][11] != '')) {
if ($return_as_array) { if ($return_as_array) {
$filter['offset'] = $other['data'][11]; $filter['offset'] = $other['data'][11];
} }
@ -3870,7 +3870,7 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if (isset($other['data'][12]) && ($other['data'][12] != null)) { if (isset($other['data'][12]) && ($other['data'][12] != '')) {
if ($return_as_array) { if ($return_as_array) {
$filter['total'] = false; $filter['total'] = false;
$filter['more_criticity'] = false; $filter['more_criticity'] = false;
@ -3897,7 +3897,7 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if (isset($other['data'][13]) && ($other['data'][13] != null)) { if (isset($other['data'][13]) && ($other['data'][13] != '')) {
if ($return_as_array) { if ($return_as_array) {
$filter['id_group'] = $other['data'][13]; $filter['id_group'] = $other['data'][13];
} }
@ -3906,7 +3906,7 @@ function otherParameter2Filter($other, $return_as_array = false) {
} }
} }
if (isset($other['data'][14]) && ($other['data'][14] != null)) { if (isset($other['data'][14]) && ($other['data'][14] != '')) {
if ($return_as_array) { if ($return_as_array) {
$filter['tag'] = $other['data'][14]; $filter['tag'] = $other['data'][14];
@ -3915,6 +3915,25 @@ function otherParameter2Filter($other, $return_as_array = false) {
$filterString .= " AND tags LIKE '%" . $other['data'][14]."%'"; $filterString .= " AND tags LIKE '%" . $other['data'][14]."%'";
} }
} }
if (isset($other['data'][15]) && ($other['data'][15] != '')) {
if ($return_as_array) {
$filter['event_type'] = $other['data'][15];
}
else {
$event_type = $other['data'][15];
if ($event_type == "not_normal") {
$filterString .= " AND ( event_type LIKE '%warning%'
OR event_type LIKE '%critical%' OR event_type LIKE '%unknown%' ) ";
}
else {
$filterString .= ' AND event_type LIKE "%' . $event_type . '%"';
}
}
}
if ($return_as_array) { if ($return_as_array) {
return $filter; return $filter;
} }
@ -4529,6 +4548,8 @@ function get_events__with_user($trash1, $trash2, $other, $returnType, $user_in_d
} }
if (isset($filter['tag'])) if (isset($filter['tag']))
$tag = $filter['tag']; $tag = $filter['tag'];
if (isset($filter['event_type']))
$event_type = $filter['event_type'];
if ($filter['utimestamp']) { if ($filter['utimestamp']) {
if (isset($filter['utimestamp']['>'])) { if (isset($filter['utimestamp']['>'])) {
$utimestamp_upper = $filter['utimestamp']['>']; $utimestamp_upper = $filter['utimestamp']['>'];
@ -4581,8 +4602,8 @@ function get_events__with_user($trash1, $trash2, $other, $returnType, $user_in_d
$sql_post .= " AND event_type LIKE '%$event_type%' "; $sql_post .= " AND event_type LIKE '%$event_type%' ";
} }
elseif ($event_type == "not_normal") { elseif ($event_type == "not_normal") {
$sql_post .= " AND event_type LIKE '%warning%' $sql_post .= " AND ( event_type LIKE '%warning%'
OR event_type LIKE '%critical%' OR event_type LIKE '%unknown%' "; OR event_type LIKE '%critical%' OR event_type LIKE '%unknown%' ) ";
} }
else { else {
$sql_post .= " AND event_type = '".$event_type."'"; $sql_post .= " AND event_type = '".$event_type."'";