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

Changed the agent name by its alias in the events sections

This commit is contained in:
Alejandro Gallardo Escobar 2017-02-21 19:06:59 +01:00
parent 1e88c6d457
commit 6fc884d327
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/godmode/events/event_edit_filter.php
View File

@ -57,6 +57,7 @@ if ($id) {
$search = $filter['search'];
$text_agent = $filter['text_agent'];
$id_agent = $filter['id_agent'];
$text_module = $filter['text_module'];
$id_agent_module = $filter['id_agent_module'];
$pagination = $filter['pagination'];
$event_view_hr = $filter['event_view_hr'];
@ -76,13 +77,13 @@ if ($id) {
$filter_only_alert = $filter['filter_only_alert'];
if ($id_agent_module != 0) {
$text_module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id_agent_module);
$text_module = modules_get_agentmodule_name($id_agent_module);
if ($text_module == false) {
$text_module = '';
}
}
if ($id_agent != 0) {
$text_agent = db_get_value('alias', 'tagente', 'id_agente', $id_agent);
$text_agent = agents_get_alias($id_agent);
if ($text_agent == false) {
$text_agent = '';
}
@ -111,7 +112,7 @@ else {
$filter_only_alert = '';
}
if($update || $create) {
if ($update || $create) {
$id_group = (string) get_parameter ('id_group');
$id_group_filter = get_parameter('id_group_filter');
$id_name = (string) get_parameter ('id_name');
@ -120,8 +121,9 @@ if($update || $create) {
$status = get_parameter('status', '');
$search = get_parameter('search', '');
$text_agent = get_parameter('text_agent', '');
$id_agent_module = get_parameter('module_search_hidden', '');
$id_agent = get_parameter('id_agent', '');
$id_agent = (int) get_parameter('id_agent');
$text_module = get_parameter('text_module', '');
$id_agent_module = (int) get_parameter('module_search_hidden');
$pagination = get_parameter('pagination', '');
$event_view_hr = get_parameter('event_view_hr', '');
$id_user_ack = get_parameter('id_user_ack', '');
@ -383,10 +385,9 @@ $table->data[20][1] = html_print_select(
"filter_only_alert", $filter_only_alert, '', '', '', true);
if (!is_metaconsole()) {
echo $id_agent_module;
$table->data[21][0] = '<b>' . __('Module search') . '</b>';
$table->data[21][1] .= html_print_autocomplete_modules('module_search',
$text_module, false, $id_agent_module, true, '', array(), true);
$text_module, false, true, '', array(), true, $id_agent_module);
}
echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&pure='.$config['pure'].'">';

2
pandora_console/include/functions_graph.php
View File

@ -3198,7 +3198,7 @@ function grafico_eventos_agente ($width = 300, $height = 200, $result = false, $
$count[] = __('SYSTEM');
}
else
$count[] = agents_get_name ($row["id_agente"]) ;
$count[] = agents_get_alias($row["id_agente"]) ;
}
}

4
pandora_console/operation/events/events.php
View File

@ -78,7 +78,7 @@ if (is_ajax ()) {
}
elseif ($event["id_agente"] > 0) {
// Agent name
echo agents_get_name ($event["id_agente"]);
echo agents_get_alias($event["id_agente"]);
}
else {
echo '';
@ -234,7 +234,7 @@ $server_id = (int)get_parameter('server_id', 0);
$text_agent = (string) get_parameter("text_agent");
if ($id_agent != 0) {
$text_agent = db_get_value('nombre', 'tagente', 'id_agente', $id_agent);
$text_agent = agents_get_alias($id_agent);
if ($text_agent == false) {
$text_agent = '';
$id_agent = 0;