From 1fbffe56b5c0189ea4ebf593c04ccbac7a3e6034 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 21 Oct 2010 15:06:53 +0000
Subject: [PATCH] 2010-10-21  Miguel de Dios  <miguel.dedios@artica.es>

	* include/functions_config.php: added check tconfig parameter
	"can_block_policies" in functions.

	Pending task: #3080762

	* operation/agentes/ver_agente.php: added hook enterprise the tab policy.

	Pending task: #3080762

	* include/functions_ui.php, operation/agentes/estado_monitores.php: cleaned
	source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3442 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                          | 14 ++++++++++++++
 pandora_console/include/functions_config.php       |  6 ++++++
 pandora_console/include/functions_ui.php           |  2 +-
 .../operation/agentes/estado_monitores.php         |  3 ++-
 pandora_console/operation/agentes/ver_agente.php   | 13 +++++++++++--
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 2755157f9b..52f6ba73c0 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-21  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* include/functions_config.php: added check tconfig parameter
+	"can_block_policies" in functions.
+	
+	Pending task: #3080762
+	
+	* operation/agentes/ver_agente.php: added hook enterprise the tab policy.
+	
+	Pending task: #3080762
+
+	* include/functions_ui.php, operation/agentes/estado_monitores.php: cleaned
+	source code style.
+
 2010-10-20  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/servers/manage_export_form.php
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index da9da38b59..8c1eebd106 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -219,6 +219,8 @@ function update_config () {
 	update_config_value ('sound_alert', get_parameter('sound_alert', $config['sound_alert']));
 	update_config_value ('sound_critical', get_parameter('sound_critical', $config['sound_critical']));
 	update_config_value ('sound_warning', get_parameter('sound_warning', $config['sound_warning']));
+	
+	update_config_value ('can_block_policies', get_parameter('can_block_policies', $config['can_block_policies']));
 }
 
 /**
@@ -563,6 +565,10 @@ function process_config () {
 	if (!isset ($config['autoupdate'])) {
 		update_config_value ( 'autoupdate', 0);
 	}
+	
+	if (!isset ($config['can_block_policies'])) {
+		update_config_value ( 'can_block_policies', 0);
+	}
 
 	/* Finally, check if any value was overwritten in a form */
 	update_config ();
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 3f41711675..2503e5e310 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -492,7 +492,7 @@ function format_alert_row ($alert, $compound = false, $agent = true, $url = '')
 	
 	$actions = get_alert_agent_module_actions ($alert['id'], false, $compound);
 
-	if (!empty($actions)){
+	if (!empty($actions)) {
 		$actionText = '<ul class="action_list">';
 		foreach ($actions as $action) {
 			$actionText .= '<li><div><span class="action_name">' . $action['name'];
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 4e7bb65197..37893c3d39 100644
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -303,7 +303,8 @@ foreach ($modules as $module) {
 			case 60: $salida = "FATAL"; $style="font-weight:bold; color:red;"; break;
 		}
 		$salida = "<span style='$style'>$salida</span>";
-	} else {
+	}
+	else {
 		if (is_numeric($module["datos"])){
 			$salida = format_numeric($module["datos"]);
 		}
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 7ecab88e54..1a0610fb59 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -382,7 +382,8 @@ $slatab['text']= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agent
 
 if ($tab == 'sla') {
 	$slatab['active'] = true;
-} else {
+}
+else {
 	$slatab['active'] = false;
 }
 
@@ -397,6 +398,11 @@ $collectiontab = enterprise_hook('collection_tab');
 
 if ($collectiontab == -1)
 	$collectiontab = "";
+	
+/* Policy */
+$policyTab = enterprise_hook('policy_tab');
+if ($policyTab == -1)
+	$policyTab = "";
 
 /* Group tab */
 
@@ -444,7 +450,7 @@ else {
 $onheader = array('manage' => $managetab, 'separator' => "", 'main' => $maintab, 
 				'data' => $datatab, 'alert' => $alerttab, 'sla' => $slatab, 
 				'inventory' => $inventorytab, 'collection' => $collectiontab, 
-				'group' => $grouptab, 'gis' => $gistab, 'custom' => $custom_fields, 'graphs' => $graphs);
+				'group' => $grouptab, 'gis' => $gistab, 'custom' => $custom_fields, 'graphs' => $graphs, 'policy' => $policyTab);
 
 print_page_header (__('Agent').'&nbsp;-&nbsp;'.mb_substr(get_agent_name($id_agente),0,25), $icon, false, "", false, $onheader);
 
@@ -483,6 +489,9 @@ switch ($tab) {
 	case "collection":
 		enterprise_include ('operation/agentes/collection_view.php');
 		break;
+	case 'policy':
+		enterprise_include ('operation/agentes/policy_view.php');
+		break;
 	case "graphs";
 		require("operation/agentes/graphs.php");
 		break;