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

Merge branch 'ent-966-os_version-en-ficheros-xml-ext-4098-v7-0' into 'develop' 

Ent 966 os version en ficheros xml ext 4098 v7 0

See merge request !813
This commit is contained in:
vgilc 2017-09-13 12:53:43 +02:00
parent 4cc2a5da0a 89fc3c457a
commit 754697f51c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/functions_events.php
View File

@ -2031,7 +2031,8 @@ function events_page_details ($event, $server = "") {
$data = array();
$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('OS').'</div>';
$data[1] = ui_print_os_icon ($agent["id_os"], true, true).' ('.$agent["os_version"].')';
$data[1] = ui_print_os_icon ($agent["id_os"], true, true);
if (!empty($agent["os_version"])) $data[1] .= ' ('.$agent["os_version"].')';
$table_details->data[] = $data;
$data = array();

2
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -312,7 +312,7 @@ sub process_xml_data ($$$$$) {
# Check some variables
$interval = 300 if (! defined ($interval) || $interval eq '');
$os_version = 'N/A' if (! defined ($os_version) || $os_version eq '');
$os_version = undef if (! defined ($os_version) || $os_version eq '');
# Get agent address from the XML if available
my $address = '' ;