From bdcd0bce3f4e03bff84cbc5f9c4208b28eff9c4c Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 5 Oct 2010 09:33:08 +0000 Subject: [PATCH] 2010-10-05 Sergio Martin * operation/agentes/estado_ultimopaquete.php: Added the policy column to the monitors list for bug 3078713 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3341 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 ++++ .../agentes/estado_ultimopaquete.php | 25 ++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4171103398..e0edee2a86 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-10-05 Sergio Martin + + * operation/agentes/estado_ultimopaquete.php: Added the policy + column to the monitors list for bug 3078713 + 2010-10-04 Sergio Martin * include/languages/cs.po diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index 75d378cb95..2f4f35bf78 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -151,8 +151,13 @@ if ($modules === false) { return; } +$isFunctionPolicies = enterprise_include_once ('include/functions_policies.php'); + echo ""; echo ""; +if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { + echo ""; +} echo ""; } @@ -212,6 +218,23 @@ foreach ($modules as $module) { } } echo ""; + + if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { + if($module["id_policy_module"] != 0) { + echo ""; + } + else { + echo ""; + } + } $nombre_grupomodulo = get_modulegroup_name ($module["id_module_group"]); if ($nombre_grupomodulo != ""){ if (($label_group == 0) || ($last_label != $nombre_grupomodulo)){ // Show label module group
".__('P.')."".__('Module name') . ' ' . '' . ''; @@ -194,7 +199,8 @@ foreach ($modules as $module) { // Render module group names (fixed code) $nombre_grupomodulo = get_modulegroup_name ($module["id_module_group"]); $last_modulegroup = $module["id_module_group"]; - echo "
+ $colspan = 9 + (int)$isFunctionPolicies; + echo "
".$nombre_grupomodulo."
"; + $img = 'images/policies.png'; + $id_policy = get_db_value_sql('SELECT id_policy FROM tpolicy_modules WHERE id = '.$module["id_policy_module"]); + $name_policy = get_db_value_sql('SELECT name FROM tpolicies WHERE id = '.$id_policy); + $policyInfo = infoModulePolicy($module["id_policy_module"]); + echo'' . + print_image($img,true, array('title' => $name_policy)) . + ''; + echo "