From ebf958afc17409fa54da9df3a6325960ee4e736b Mon Sep 17 00:00:00 2001
From: alexhigh <alex@artica.es>
Date: Wed, 27 Aug 2014 17:09:07 +0000
Subject: [PATCH] 2014-08-27  Alejandro Gallardo <alejandro.gallardo@artica.es>

	* operation/visual_console/render_view.php,
	  godmode/reporting/visual_console_builder.php: Added hooks
	to the enterprise wizard of services.

	* include/constants.php: Added constants for the services modes.

	* operation/events/events.php,
	  operation/events/events.build_query.php: Now is possible to
	filter the events by module id programmatically.

	* images/wand_services.png: Added image.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10464 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 .../reporting/visual_console_builder.php      |  78 ++++++++++++------
 pandora_console/images/wand_services.png      | Bin 0 -> 1351 bytes
 pandora_console/include/constants.php         |   5 +-
 .../operation/events/events.build_query.php   |   5 ++
 pandora_console/operation/events/events.php   |   1 +
 .../operation/visual_console/render_view.php  |   6 ++
 6 files changed, 71 insertions(+), 24 deletions(-)
 create mode 100644 pandora_console/images/wand_services.png

diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 50b47d9d34..a72ce6dc71 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -47,7 +47,7 @@ else {
 	$action = get_parameterBetweenListValues('action2', array('new', 'save', 'edit', 'update', 'delete'), 'new');
 }
 
-$activeTab = get_parameterBetweenListValues('tab', array('data', 'list_elements', 'wizard', 'editor'), 'data');
+$activeTab = get_parameterBetweenListValues('tab', array('data', 'list_elements', 'wizard', 'wizard_services', 'editor'), 'data');
 
 $refr = (int) get_parameter ('refr', $config['vc_refr']);
 
@@ -397,6 +397,25 @@ switch ($activeTab) {
 				break;
 		}
 		break;
+	case 'wizard_services':
+		$visualConsole = db_get_row_filter('tlayout', array('id' => $idVisualConsole));
+		$visualConsoleName = $visualConsole['name'];
+		switch ($action) {
+			case 'update':
+				enterprise_include_once("/include/functions_visual_map.php");
+				
+				$icon = (string) get_parameter('icon');
+				$id_services = (array) get_parameter('services_selected');
+				
+				$result = enterprise_hook('enterprise_visual_map_process_services_wizard_add', array($id_services, $idVisualConsole, $icon));
+				if ($result != ENTERPRISE_NOT_HOOK) {
+					$statusProcessInDB = array('flag' => $result['status'], 'message' => $result['message']);
+				}
+				
+				$action = 'edit';
+				break;
+		}
+		break;
 	case 'editor':
 		switch ($action) {
 			case 'new':
@@ -429,28 +448,36 @@ else {
 // Hash for auto-auth in public link
 $hash = md5($config["dbpass"] . $id_layout . $config["id_user"]);
 
-$buttons = array(
-	'consoles_list' => array('active' => false,
-		'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/map_builder&refr=' . $refr . '">' .
-			html_print_image ("images/visual_console.png", true, array ("title" => __('Visual consoles list'))) .'</a>'),
-	'public_link' => array('active' => false,
-		'text' => '<a href="' . ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]) . '">'.
-			html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).'</a>'),
-	'data' => array('active' => false,
-		'text' => '<a href="' . $url_base . $action . '&tab=data&id_visual_console=' . $idVisualConsole . '">' . 
-			html_print_image ("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>'),
-	'list_elements' => array('active' => false,
-		'text' => '<a href="' . $url_base . $action . '&tab=list_elements&id_visual_console=' . $idVisualConsole . '">' .
-			html_print_image ("images/list.png", true, array ("title" => __('List elements'))) .'</a>'),
-	'wizard' => array('active' => false,
-		'text' => '<a href="' . $url_base . $action . '&tab=wizard&id_visual_console=' . $idVisualConsole . '">' .
-			html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .'</a>'),
-	'editor' => array('active' => false,
-		'text' => '<a href="' . $url_base . $action . '&tab=editor&id_visual_console=' . $idVisualConsole . '">' .
-			html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .'</a>'),
-	'view' => array('active' => false,
-		'text' => '<a href="' . $url_view . '">' .
-			html_print_image ("images/operation.png", true, array ("title" => __('View'))) .'</a>'));
+$buttons = array();
+
+$buttons['consoles_list'] = array('active' => false,
+	'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/map_builder&refr=' . $refr . '">' .
+		html_print_image ("images/visual_console.png", true, array ("title" => __('Visual consoles list'))) .'</a>');
+$buttons['public_link'] = array('active' => false,
+	'text' => '<a href="' . ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]) . '">'.
+		html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).'</a>');
+$buttons['data'] = array('active' => false,
+	'text' => '<a href="' . $url_base . $action . '&tab=data&id_visual_console=' . $idVisualConsole . '">' . 
+		html_print_image ("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>');
+$buttons['list_elements'] = array('active' => false,
+	'text' => '<a href="' . $url_base . $action . '&tab=list_elements&id_visual_console=' . $idVisualConsole . '">' .
+		html_print_image ("images/list.png", true, array ("title" => __('List elements'))) .'</a>');
+
+if (enterprise_installed()) {
+	$buttons['wizard_services'] = array('active' => false,
+		'text' => '<a href="' . $url_base . $action . '&tab=wizard_services&id_visual_console=' . $idVisualConsole . '">' .
+			html_print_image ("images/wand_services.png", true, array ("title" => __('Services wizard'))) .'</a>');
+}
+
+$buttons['wizard'] = array('active' => false,
+	'text' => '<a href="' . $url_base . $action . '&tab=wizard&id_visual_console=' . $idVisualConsole . '">' .
+		html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .'</a>');
+$buttons['editor'] = array('active' => false,
+	'text' => '<a href="' . $url_base . $action . '&tab=editor&id_visual_console=' . $idVisualConsole . '">' .
+		html_print_image ("images/builder.png", true, array ("title" => __('Builder'))) .'</a>');
+$buttons['view'] = array('active' => false,
+	'text' => '<a href="' . $url_view . '">' .
+		html_print_image ("images/operation.png", true, array ("title" => __('View'))) .'</a>');
 
 if ($action == 'new' || $idVisualConsole === false) {
 	$buttons = array('data' => $buttons['data']); //Show only the data tab
@@ -474,6 +501,11 @@ switch ($activeTab) {
 	case 'wizard':
 		require_once($config['homedir'] . '/godmode/reporting/visual_console_builder.wizard.php');
 		break;
+	case 'wizard_services':
+		if (enterprise_installed()) {
+			enterprise_include('/godmode/reporting/visual_console_builder.wizard_services.php');
+		}
+		break;
 	case 'data':
 		require_once($config['homedir'] . '/godmode/reporting/visual_console_builder.data.php');
 		break;
diff --git a/pandora_console/images/wand_services.png b/pandora_console/images/wand_services.png
new file mode 100644
index 0000000000000000000000000000000000000000..2654e5ee9da3dade348da8a6574b550789b079b2
GIT binary patch
literal 1351
zcmbVMZ%i9y7=PPB!@6}NghZH%=XGcz(0kwO{|l9tYik=QtEI_^`oW`j&;#zz?v7C~
zn&M^@V~krInnm5%SlkD*0P%yU2_upvny54J!=fgRN!&Mq#D!$R%=dtzF=QXS<Z|!x
z-0%1Nf8L2q*E3GXVFv)fnM%g8_*-YbRdxU@@2O513-w04$LLo2j1f)~K$KT{1tKMJ
z{X$mY_|fBE3#|ay3SzFu=t*}nc|~$_CdOTqRLlmTwXLXf`9Z-TdWC*b4wI{2ERclA
zhsk5UG)$|kP!N-2n$SJgmCKI}=0iN$_B7F2WUv8AFgT(p4aquF43k@S8GJU?6iIAB
zjKMIu9aK*`L$Hb_5I#3-$wNOP{9ZTm!jL!AOwbTP3egk{v>?d%0t`gN&O>5v8sEoc
zV~HJKSPGK`!%!KD8W|aJk9gdQ)=!~OC`3V;qUjclXwgSygDbYkx~ps<Cg^!hR1Hy)
z3DY9is|*`q5=Xk7f~2O?yM|?br%<?LRFP9D<c5?anR#uYbt5bM6ULrsJvXWfR94WH
zVJ(mQ(dR0YaqS-L$OPhOn4_AAo5Bsnl>D$H$VMs_Ch;FPFY*lZ1tCHKFAUJoA4Dh^
z^~VzN03C|AqnHQ5vW>mCw3np={s5%?bONEcH|UA7?LnW<kJ>{p5%rY0DOoo-IWLs`
zirDWq*PnPGmti%5GZZbSC`085$P^Sq(F=-7u-!g4BGO!5lueD<pzVBPf+n62_=KiN
z#8!nFagPWf`cLLT)*tnHyipJGAYZ(l+~M;7r)m@qhBC+FU*l3%;TbfKyTgx#-SrV<
zyfYeJj)y-S4C4J9PQ{|R;!nMs_wTpa4#4rML?Tgr_q^qZZOKYBL;xb2Y_<#6Ua}jY
zI&uIC5$0A~MJ-r=#m@f)*<~hEaRCq|D4hz`tVBL@)z{sd@-E%YJXYeJGxLA6ecthG
z#d1yLcB_BEQc>M?Y}vX-#II)_T77-)(NbOQr1Q$buWlDJ8SDDX{FAe{)-Ds?Itcd9
zI`$<h-Pq&GYc=sjN5#g};=P8$8>>^B;FCqi$_9JVYx(B<p$^B)ky6vacgAgxJBjXJ
zT|b}dw&m7GADR8W^wEU+)b$&YBzn`{TYG6Rc(il+^x1J>eT#SUjg3R|wH;S|rOCj|
z^ofRZUpgZ5^>5s<&05cly-U8GxmkBj3tU-SA}P>uF*97L>JzhIAZg7GY##d7cISsP
ze~wMJM$c6i>i7Si<-y!9z{MxmEX`Hlu_u?n<i6vLp^MFt!236UWN%nC=Mx3XW&3ZR
kmY%a;dOou7L1z;Hrw3fFkC*3OFt4^$yeoFK{l!=R1_92v3IG5A

literal 0
HcmV?d00001

diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index 5dabafe113..98144a7157 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -226,7 +226,10 @@ define('SERVICE_ELEMENT_WEIGHT_CRITICAL', 1);
 define('SERVICE_ELEMENT_WEIGHT_WARNING', 0.5);
 define('SERVICE_ELEMENT_WEIGHT_OK', 0);
 define('SERVICE_ELEMENT_WEIGHT_UNKNOWN', 0);
-
+//Modes
+define('SERVICE_MODE_MANUAL', 0);
+define('SERVICE_MODE_AUTO', 1);
+define('SERVICE_MODE_SIMPLE', 2);
 
 
 /* Status images */
diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php
index 5bdc878177..6e385f7ee6 100755
--- a/pandora_console/operation/events/events.build_query.php
+++ b/pandora_console/operation/events/events.build_query.php
@@ -123,6 +123,11 @@ else {
 			$sql_post .= " AND id_agente = " . $id_agent;
 			break;
 	}
+
+}
+
+if ($id_agent_module) {
+	$sql_post .= " AND id_agentmodule = " . $id_agent_module;
 }
 
 if ($id_user_ack != "0")
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index ff03eb1730..53273f6a18 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -193,6 +193,7 @@ $event_type = get_parameter ("event_type", ''); // 0 all
 $severity = (int) get_parameter ("severity", -1); // -1 all
 $status = (int) get_parameter ("status", 3); // -1 all, 0 only new, 1 only validated, 2 only in process, 3 only not validated,
 $id_agent = (int) get_parameter ("id_agent", 0);
+$id_agent_module = (int) get_parameter ("id_agent_module", 0);
 $pagination = (int) get_parameter ("pagination", $config["block_size"]);
 $event_view_hr = (int) get_parameter ("event_view_hr", $history ? 0 : $config["event_view_hr"]);
 $id_user_ack = get_parameter ("id_user_ack", 0);
diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php
index 2cd7a780ef..42c85ce38a 100644
--- a/pandora_console/operation/visual_console/render_view.php
+++ b/pandora_console/operation/visual_console/render_view.php
@@ -96,6 +96,12 @@ if (check_acl ($config["id_user"], $id_group, "RW")) {
 		html_print_image ("images/op_reporting.png", true, array ("title" => __('Main data'))) .'</a>';
 	$options['list_elements']['text'] = '<a href="' . $url_base . $action . '&tab=list_elements&id_visual_console=' . $id_layout . '">' .
 		html_print_image ("images/list.png", true, array ("title" => __('List elements'))) .'</a>';
+
+	if (enterprise_installed()) {
+		$options['wizard_services']['text'] = '<a href="' . $url_base . $action . '&tab=wizard_services&id_visual_console=' . $id_layout . '">' .
+				html_print_image ("images/wand_services.png", true, array ("title" => __('Services wizard'))) .'</a>';
+	}
+
 	$options['wizard']['text'] = '<a href="' . $url_base . $action . '&tab=wizard&id_visual_console=' . $id_layout . '">' .
 		html_print_image ("images/wand.png", true, array ("title" => __('Wizard'))) .'</a>';
 	$options['editor']['text'] = '<a href="' . $url_base . $action . '&tab=editor&id_visual_console=' . $id_layout . '">' .