From 87c4d63bc36aa8d8d5a183ecab2dd1d367657416 Mon Sep 17 00:00:00 2001
From: esanchezm <noreply@pandorafms.org>
Date: Tue, 19 May 2009 09:57:38 +0000
Subject: [PATCH] 2009-05-19  Esteban Sanchez  <estebans@artica.es>

	* include/functions_alerts.php: Added get_agents_with_alert_template().
	Added extra filter to delete_alert_agent_module().

	* godmode/agentes/massive_delete_alerts.php: Completely changed the way it
	works. Fixes #2707976.

	* images/mod_keepalive.png: Replaced with tango icon.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1694 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  10 ++
 .../godmode/agentes/massive_delete_alerts.php | 117 ++++++++++++------
 pandora_console/images/mod_keepalive.png      | Bin 740 -> 647 bytes
 pandora_console/include/functions_alerts.php  |  24 +++-
 4 files changed, 107 insertions(+), 44 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f5969806ea..34dee668fd 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-19  Esteban Sanchez  <estebans@artica.es>
+
+	* include/functions_alerts.php: Added get_agents_with_alert_template().
+	Added extra filter to delete_alert_agent_module().
+
+	* godmode/agentes/massive_delete_alerts.php: Completely changed the way it
+	works. Fixes #2707976.
+	
+	* images/mod_keepalive.png: Replaced with tango icon.
+
 2009-05-18  Esteban Sanchez  <estebans@artica.es>
 
 	* images/mod_async_string.png, images/mod_async_inc.png,
diff --git a/pandora_console/godmode/agentes/massive_delete_alerts.php b/pandora_console/godmode/agentes/massive_delete_alerts.php
index 549e1b1eb4..605df98c35 100644
--- a/pandora_console/godmode/agentes/massive_delete_alerts.php
+++ b/pandora_console/godmode/agentes/massive_delete_alerts.php
@@ -29,25 +29,43 @@ if (! give_acl ($config['id_user'], 0, "AW")) {
 require_once ('include/functions_agents.php');
 require_once ('include/functions_alerts.php');
 
-echo '<h3>'.__('Massive alerts deletion').'</h3>';
+if (is_ajax ()) {
+	$get_agents = (bool) get_parameter ('get_agents');
+	
+	if ($get_agents) {
+		$id_group = (int) get_parameter ('id_group');
+		$id_alert_template = (int) get_parameter ('id_alert_template');
+		
+		$agents_alerts = get_agents_with_alert_template ($id_alert_template, $id_group,
+			false, array ('tagente.nombre', 'tagente.id_agente'));
+		
+		echo json_encode (index_array ($agents_alerts, 'id_agente', 'nombre'));
+		return;
+	}
+	return;
+}
 
-function process_manage_delete ($id_alerts) {
-	if (empty ($id_alerts)) {
-		echo '<h3 class="error">'.__('No alerts selected').'</h3>';
+echo '<h3>'.__('Massive alerts deletion').'</h3>';
+function process_manage_delete ($id_alert_template, $id_agents) {
+	if (empty ($id_alert_template)) {
+		echo '<h3 class="error">'.__('No alert selected').'</h3>';
 		return false;
 	}
 	
-	process_sql_begin ();
-	
-	foreach ($id_alerts as $id_alert) {
-		$success = delete_alert_agent_module ($id_alert);
-		if (! $success)
-			break;
+	if (empty ($id_agents)) {
+		echo '<h3 class="error">'.__('No agents selected').'</h3>';
+		return false;
 	}
 	
+	$modules = get_agent_modules ($id_agents, 'id_agente_modulo', false, true);
+	
+	process_sql_begin ();
+	$success = delete_alert_agent_module (false,
+		array ('id_agent_module' => $modules,
+			'id_alert_template' => $id_alert_template));
 	if (! $success) {
 		echo '<h3 class="error">'.__('There was an error deleting the alert, the operation has been cancelled').'</h3>';
-		echo '<h4>'.__('Could not delete alert').' '.get_agentmodule_name ($id_module).'</h4>';
+		echo '<h4>'.__('Could not delete alert in agent %s', get_agent_name ($id_agent)).'</h4>';
 		process_sql_rollback ();
 	} else {
 		echo '<h3 class="suc">'.__('Successfully deleted').'</h3>';
@@ -56,13 +74,13 @@ function process_manage_delete ($id_alerts) {
 }
 
 $id_group = (int) get_parameter ('id_group');
-$id_agent = (int) get_parameter ('id_agent');
-$id_alerts = get_parameter ('id_alerts');
+$id_agents = (array) get_parameter ('id_agents');
+$id_alert_template = (int) get_parameter ('id_alert_template');
 
 $delete = (bool) get_parameter_post ('delete');
 
 if ($delete) {
-	process_manage_delete ($id_alerts);
+	process_manage_delete ($id_alert_template, $id_agents);
 }
 
 $groups = get_user_groups ();
@@ -78,34 +96,23 @@ $table->size[0] = '15%';
 $table->size[1] = '85%';
 
 $table->data = array ();
-$table->data[0][0] = __('Group');
-$table->data[0][1] = print_select ($groups, 'id_group', $id_group,
-	false, '', '', true);
 
-$table->data[1][0] = __('Agent');
-$table->data[1][0] .= '<span id="agent_loading" class="invisible">';
-$table->data[1][0] .= '<img src="images/spinner.gif" />';
-$table->data[1][0] .= '</span>';
-$table->data[1][1] = print_select (get_group_agents ($id_group, false, "none"),
-	'id_agent', $id_agent, false, __('None'), 0, true);
+$table->data[0][0] = __('Alert template');
+$table->data[0][1] = print_select (get_alert_templates (),
+	'id_alert_template', $id_alert_template, false, __('Select'), 0, true);
+	
+$table->data[1][0] = __('Group');
+$table->data[1][1] = print_select ($groups, 'id_group', $id_group,
+	'', '', '', true, false, true, '', $id_alert_template == 0);
 
-$table->data[2][0] = __('Alerts');
-$table->data[2][0] .= '<span id="alert_loading" class="invisible">';
+$table->data[2][0] = __('Agent');
+$table->data[2][0] .= '<span id="agent_loading" class="invisible">';
 $table->data[2][0] .= '<img src="images/spinner.gif" />';
 $table->data[2][0] .= '</span>';
-$alerts = array ();
-if ($id_agent) {
-	$simple_alerts = get_agent_alerts_simple ($id_agent, '', false);
-	if ($simple_alerts !== false) {
-		foreach ($simple_alerts as $alert) {
-			$name = get_alert_template_name ($alert['id_alert_template']);
-			$name .= ' ('.get_agentmodule_name ($alert['id_agent_module']).')';
-			$alerts[$alert['id']] = $name;
-		}
-	}
-}
-$table->data[2][1] = print_select ($alerts,
-	'id_alerts[]', 0, false, '', '', true, true);
+$agents_alerts = get_agents_with_alert_template ($id_alert_template, $id_group,
+	false, array ('tagente.nombre', 'tagente.id_agente'));
+$table->data[2][1] = print_select (index_array ($agents_alerts, 'id_agente', 'nombre'),
+	'id_agents', '', '', '', '', true, true, true, '', $id_alert_template == 0);
 
 echo '<form method="post" onsubmit="if (! confirm(\''.__('Are you sure').'\')) return false;">';
 print_table ($table);
@@ -125,9 +132,37 @@ require_jquery_file ('pandora.controls');
 <script type="text/javascript">
 /* <![CDATA[ */
 $(document).ready (function () {
-	$("#id_group").pandoraSelectGroupAgent ();
-	$("#id_agent").pandoraSelectAgentAlert ({
-		alertSelect: "select#id_alerts"
+	$("#id_alert_template").change (function () {
+		if (this.value != 0) {
+			$("#id_agents").enable ();
+			$("#id_group").enable ().change ();
+			
+		} else {
+			$("#id_group, #id_agents").disable ();
+		}
+	});
+	$("#id_group").change (function () {
+		var $select = $("#id_agents").disable ();
+		$("#agent_loading").show ();
+		$("option[value!=0]", $select).remove ();
+		
+		jQuery.post ("ajax.php",
+			{"page" : "godmode/agentes/massive_delete_alerts",
+			"get_agents" : 1,
+			"id_group" : this.value,
+			"id_alert_template" : $("#id_alert_template").attr ("value")
+			},
+			function (data, status) {
+				options = "";
+				jQuery.each (data, function (id, value) {
+					options += "<option value=\""+id+"\">"+value+"</option>";
+				});
+				$("#id_agents").append (options);
+				$("#agent_loading").hide ();
+				$select.enable ();
+			},
+			"json"
+		);
 	});
 });
 /* ]]> */
diff --git a/pandora_console/images/mod_keepalive.png b/pandora_console/images/mod_keepalive.png
index 90b466fba75d4ae6a6cc67ff894d09836eb3f948..58dd371bf183c1e6d19c53bf915175c750183b70 100644
GIT binary patch
delta 591
zcmV-V0<it$1&0NY7YYyv1^@s6R9h^Jks%fd000000Qp0^e~~~Qf7t~R4-FcKg*Pbx
z00IX|L_t(Y$K95{i_}mM$3Jf`ryjO;qTm(&0fK*lASl`hih@5tZ1n0w8yhY3`UPuI
z3sFQ+wpd&%f8Z~)R=7$m#Y%<E%vfZy$>v_d+b%dTB$;_HneWVeClCG;2>|2C=qzw=
z!M*1WA3A!!S7^qQe~~RJ<H^WcUUvjA;CRE{w%&mKz?U+yHCX|ExZff=lWg`jGggmn
zBmv)ieznWJ20Q_-0M8P0`4#vEoB|%!?3aKy?k56tD-cy-*X}(@UsaVh*FIn`Z~*uW
ztOA>fU~YSRKLQk32G)TSDVr-GX1pGrtkv5ZWU7*(*48Cle+F&>IdH?D*Asz!0=@%h
zfCs>Nuf)fW_6%Erh@z?(5UgBc)p`R9g?V6uSRgxqi;cj40@s1R3smKfSLK=~A{uy8
z26c|82r7c8AR>sUYhf$>7O%)@;JtsW)OT)Am6yOT;IUs{q;4EkeeXf57GUN8x#q%D
z@-~jF0mFuEf9RyIw?=g8)Z~^=yp5I#*FCjV6;Ua;Va|$Rn3WZ+_UTeIhJz8?$hE62
zn)atHYeN#*%?uHl<CIyLOGXG_25Q>7Kl==bNYPRjDW+kB5(NR39s@CyT(pQhbaXIa
zeXhvzQbyRhLYPq`_`S_FsrB^Gm;vO|{KDH0ukJ2-EokiB>9;nDGhjQg%{8kPVha2Q
d{`h^b<R3+mCp+{V59I&=002ovPDHLkV1ggF2rU2r

delta 685
zcmV;e0#f~l1>^;g7YYvu1^@s6rrVstks%fd{{a60|De66laW9kf7k>84jeeUZat0w
z00Lx5L_t(Y$L*ERYZE~f$3L^1l4?E7M&ch}{c#ZVCLRO@K{O~TwJ1I3A}HvgSHYXd
zdK9UiEI|_$^bjaY4-$G;R6^>(P{al`vQ5qA$Bu_i;&wZmq(#WZ2gA;L^H|>ZeZTWY
z#9}eEZ~sB6ZjJ4lfA9NLzpv2n>VhGea1y)K<7auY`M2BtNyDo%pMAi$^5>xeiGc#;
zv&Y$`p$UZPYlsQ4e&Ts`;v*vr(?l|vRK;SkTU0+&N@+|R^HZr5g+gIyj98{3qfAOE
z9LK?N9Hf*;DTS1>SMg7Q*P+;=A+Hm=2TTUyCxAJ<Ujh~ae``7<t-m0I5Ro01Qi_R0
zTxDja5Ie_cmzS8j^G4;Wo-pMDW58aZ1tfvW0F8YD+|UgGxBz7Jz5<-=$%qi5TS#yp
zVoGIZZ-QHdr3LI-nMY^i08uoa177NNX+VV(fWyG3_D=!%ElJDw{r<^gqlndC&;%Mj
zc6>*#^eaFHe|Q009uSDqg`Wlv0YzX<pCv=mnlehuvaINdpc(R)zaTUS-)*t-wXrED
zAgklRjP{QL3E;<o^123m0&;<Pe`%Q}lYt>|_0}9e-<SFQahc^06|NW7qK3qIU=}!|
z*L~pPfUGP6M}QRYY76hkIvc^lP4@&KSM@|L<Atjhe};Q93EU0%&w<;(LoJcu>uZwT
zJa7P54a7Rq>exFy7&b~P+}Ysew{4qRt)?u?>Vga`<+^Sd_=KU$DZL*z6n-q^PaAT^
zdomJ~k%<MR6s=Y(5@-ipyWJk@%N}!GmvlOfZQGle2!o3{Yc`vdN+tf=Kd?U;vD8fj
Tll9gB3jhEBNkvXXu0mjfSPVYa

diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 82b01d401e..e7ab37359e 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -401,12 +401,16 @@ function update_alert_agent_module ($id_alert_agent_module, $values) {
 		array ('id' => $id_alert_template))) !== false;
 }
 
-function delete_alert_agent_module ($id_alert_agent_module) {
-	if (empty ($id_alert_agent_module))
+function delete_alert_agent_module ($id_alert_agent_module, $filter = false) {
+	if (empty ($id_alert_agent_module) && ! is_array ($filter))
 		return false;
+	if (! is_array ($filter))
+		$filter = array ();
+	if ($id_alert_agent_module)
+		$filter['id'] = $id_alert_agent_module;
 	
 	return (@process_sql_delete ('talert_template_modules',
-		array ('id' => $id_alert_agent_module))) !== false;
+		$filter)) !== false;
 }
 
 function get_alert_agent_module ($id_alert_agent_module) {
@@ -795,4 +799,18 @@ function delete_alert_compound ($id_alert_compound) {
 	return (@process_sql_delete ('talert_compound',
 		array ('id' => $id_alert_compound))) !== false;
 }
+
+function get_agents_with_alert_template ($id_alert_template, $id_group, $filter = false, $fields = false) {
+	if (empty ($id_alert_template))
+		return false;
+	if (! is_array ($filter))
+		$filter = array ();
+	$filter[] = 'tagente_modulo.id_agente_modulo  = talert_template_modules.id_agent_module';
+	$filter[] = 'tagente_modulo.id_agente  = tagente.id_agente';
+	$filter['id_alert_template'] = $id_alert_template;
+	$filter['`tagente`.id_agente'] = array_keys (get_group_agents ($id_group, false, "none"));
+	
+	return get_db_all_rows_filter ('tagente, tagente_modulo, talert_template_modules',
+		$filter, $fields);
+}
 ?>