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

Merge branch '523-deteccion-de-cambios-en-inventario-modulo-software-y-otros-con-varias-lineas-open-2' into 'develop' 

Improve event title format and alias rather name - #523

See merge request !577
This commit is contained in:
vgilc 2017-06-12 15:20:32 +02:00
parent 0a74a35c7e 131753cfba
commit 9c0efdeeba
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_events.php
View File

@ -2336,7 +2336,7 @@ function events_page_general ($event) {
$data = array(); $data = array();
$data[0] = __('Event name'); $data[0] = __('Event name');
$event["evento"] = str_replace ( 'event_line_jump' , '<br>' , $event["evento"]); $event["evento"] = str_replace ( '&#x0a;' , '<br>' , $event["evento"]);
$data[1] = io_safe_output($event["evento"]); $data[1] = io_safe_output($event["evento"]);
$table_general->data[] = $data; $table_general->data[] = $data;

13
pandora_server/lib/PandoraFMS/DB.pm
View File

@ -52,6 +52,7 @@ our @EXPORT = qw(
get_agent_addr_id get_agent_addr_id
get_agent_id get_agent_id
get_agent_address get_agent_address
get_agent_alias
get_agent_group get_agent_group
get_agent_name get_agent_name
get_agent_module_id get_agent_module_id
@ -287,6 +288,18 @@ sub get_agent_name ($$) {
WHERE id_agente = ?", $agent_id); WHERE id_agente = ?", $agent_id);
} }
########################################################################
## SUB get_agent_alias (agent_id)
## Return agent alias, given "agent_id"
########################################################################
sub get_agent_alias ($$) {
my ($dbh, $agent_id) = @_;
return get_db_value ($dbh, "SELECT alias
FROM tagente
WHERE id_agente = ?", $agent_id);
}
######################################################################## ########################################################################
## SUB agents_get_modules (agent_id, fields, filters) ## SUB agents_get_modules (agent_id, fields, filters)
## Return the list of modules, given "agent_id" ## Return the list of modules, given "agent_id"