From d546c8875b123dca1e70acb4ea33a1255ad433af Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 20 Jan 2011 14:41:12 +0000 Subject: [PATCH] 2011-01-20 Miguel de Dios * operation/agentes/estado_generalagente.php: fixed when the agent haven't ip address. Fixes: #3162646 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3752 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 ++++++++- .../operation/agentes/estado_generalagente.php | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e6e6a69fb5..2c1703d32b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,4 +1,11 @@ -2011-01-19 Miguel de Dios +2011-01-20 Miguel de Dios + + * operation/agentes/estado_generalagente.php: fixed when the agent haven't + ip address. + + Fixes: #3162646 + +2011-01-20 Miguel de Dios * godmode/agentes/module_manager.php: added to call to enterprise functions to delete "pseudo code" of local module when delete in multiple delete diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 4873badaf3..573e6307bb 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -81,7 +81,21 @@ echo ''.__('IP Address').''; echo ''; -print_select (array_unique(array_merge((array)get_agent_address ($id_agente),get_agent_addresses ($id_agente))), "not_used", get_agent_address ($id_agente)); +$ips = array(); +$addresses = get_agent_addresses ($id_agente); +$address = get_agent_address($id_agente); + +if (!empty($addresses)) { + $ips = $addresses; +} + +if (!empty($address)) { + $ips = array_merge((array)get_agent_address ($id_agente), $ips); +} + +$ips = array_unique($ips); + +print_select($ips, "not_used", get_agent_address ($id_agente)); echo ''; //OS