diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 15e321551d..dd2f5b9aeb 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-01-30 Miguel de Dios + + * godmode/agentes/modificar_agente.php: fixed the menu to showing + in the link to view agent. + + * operation/agentes/estado_monitores.php: cleaned source code style. + 2013-01-30 Miguel de Dios * godmode/agentes/planned_downtime.list.php, include/db/oracle.php, diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index cc931589d1..cd11b83177 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -462,7 +462,7 @@ if ($agents !== false) { sec2=godmode/agentes/configurar_agente&tab=alert& id_agente='.$agent["id_agente"].'">'.__('Alerts').''; echo ' | '; - echo ''.__('View').''; diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 6fcaee2247..2da8829ac0 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -440,26 +440,22 @@ foreach ($modules as $module) { } else { $module_value = io_safe_output($module["datos"]); - + // There are carriage returns here ? // If carriage returns present... then is a "Snapshot" data (full command output) if (preg_match ("/[\n]+/i", io_safe_output($module["datos"]))){ - - $handle = "snapshot"."_".$module["id_agente_modulo"]; - $url = 'include/procesos.php?agente='.$module["id_agente_modulo"]; - $win_handle=dechex(crc32($handle)); - + + $handle = "snapshot"."_".$module["id_agente_modulo"]; + $url = 'include/procesos.php?agente='.$module["id_agente_modulo"]; + $win_handle=dechex(crc32($handle)); + $link ="winopeng_var('operation/agentes/snapshot_view.php?id=".$module["id_agente_modulo"]."&refr=".$module["current_interval"]."&label=".$module["nombre"]."','".$win_handle."', 700,480)"; - - $salida = '' . html_print_image("images/default_list.png", true, array("border" => '0', "alt" => "", "title" => __("Snapshot view"))) . '   '; - - - // $link ="winopeng('operation/agentes/snapshot_view.php?id=".$module["id_agente_modulo"]."',$win_handle)"; - // $salida = '' . html_print_image("images/default_list.png", true, array("border" => '0', "alt" => "")) . '   '; - - } else { + + $salida = '' . html_print_image("images/default_list.png", true, array("border" => '0', "alt" => "", "title" => __("Snapshot view"))) . '   '; + } + else { $sub_string = substr(io_safe_output($module["datos"]),0, 12); - + if ($module_value == $sub_string) { $salida = $module_value; }