tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2009-05-19 Esteban Sanchez <estebans@artica.es> 

* godmode/agentes/massive_delete_alerts.php: Fixed an error when selecting
	multiple agents. Changed some strings. Deleted "None" from the agents list.
	Style corrections.

	* godmode/agentes/massive_delete_modules.php: Changed the way it works.
	Fixes #2707976.

	* images/download.png, images/star.png, images/note.png: More tango icons.

	* include/functions_alerts.php: Style corrections.
	
	* include/functions_modules.php: Added get_agents_with_module_name().



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1695 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
esanchezm 2009-05-19 11:32:13 +00:00
parent 87c4d63bc3
commit 06b49cabfd
8 changed files with 129 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/ChangeLog
View File

@ -1,3 +1,18 @@
2009-05-19 Esteban Sanchez <estebans@artica.es>
* godmode/agentes/massive_delete_alerts.php: Fixed an error when selecting
multiple agents. Changed some strings. Deleted "None" from the agents list.
Style corrections.
* godmode/agentes/massive_delete_modules.php: Changed the way it works.
Fixes #2707976.
* images/download.png, images/star.png, images/note.png: More tango icons.
* include/functions_alerts.php: Style corrections.
* include/functions_modules.php: Added get_agents_with_module_name().
2009-05-19 Esteban Sanchez <estebans@artica.es>
* include/functions_alerts.php: Added get_agents_with_alert_template().

15
pandora_console/godmode/agentes/massive_delete_alerts.php
View File

@ -57,15 +57,14 @@ function process_manage_delete ($id_alert_template, $id_agents) {
return false;
}
$modules = get_agent_modules ($id_agents, 'id_agente_modulo', false, true);
process_sql_begin ();
$modules = get_agent_modules ($id_agents, 'id_agente_modulo', false, true);
$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 in agent %s', get_agent_name ($id_agent)).'</h4>';
echo '<h3 class="error">'.__('There was an error deleting the alerts, the operation has been cancelled').'</h3>';
echo '<h4>'.__('Could not delete alerts').'</h4>';
process_sql_rollback ();
} else {
echo '<h3 class="suc">'.__('Successfully deleted').'</h3>';
@ -74,7 +73,7 @@ function process_manage_delete ($id_alert_template, $id_agents) {
}
$id_group = (int) get_parameter ('id_group');
$id_agents = (array) get_parameter ('id_agents');
$id_agents = get_parameter ('id_agents');
$id_alert_template = (int) get_parameter ('id_alert_template');
$delete = (bool) get_parameter_post ('delete');
@ -112,7 +111,7 @@ $table->data[2][0] .= '</span>';
$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);
'id_agents[]', '', '', '', '', true, true, true, '', $id_alert_template == 0);
echo '<form method="post" onsubmit="if (! confirm(\''.__('Are you sure').'\')) return false;">';
print_table ($table);
@ -136,15 +135,15 @@ $(document).ready (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 ();
$("option", $select).remove ();
jQuery.post ("ajax.php",
{"page" : "godmode/agentes/massive_delete_alerts",

117
pandora_console/godmode/agentes/massive_delete_modules.php
View File

@ -29,25 +29,44 @@ if (! give_acl ($config['id_user'], 0, "AW")) {
require_once ('include/functions_agents.php');
require_once ('include/functions_modules.php');
if (is_ajax ()) {
$get_agents = (bool) get_parameter ('get_agents');
if ($get_agents) {
$id_group = (int) get_parameter ('id_group');
$module_name = (string) get_parameter ('module_name');
$agents_modules = get_agents_with_module_name ($module_name, $id_group,
array ('delete_pending' => 0,
'`tagente_modulo`.disabled' => 0),
array ('tagente.id_agente', 'tagente.nombre'));
echo json_encode (index_array ($agents_modules, 'id_agente', 'nombre'));
return;
}
return;
}
echo '<h3>'.__('Massive modules deletion').'</h3>';
function process_manage_delete ($id_modules) {
if (empty ($id_modules)) {
echo '<h3 class="error">'.__('No modules selected').'</h3>';
function process_manage_delete ($module_name, $id_agents) {
if (empty ($module_name)) {
echo '<h3 class="error">'.__('No module selected').'</h3>';
return false;
}
if (empty ($id_agents)) {
echo '<h3 class="error">'.__('No agents selected').'</h3>';
return false;
}
process_sql_begin ();
foreach ($id_modules as $id_module) {
$success = delete_agent_module ($id_module);
if (! $success)
break;
}
$modules = get_agent_modules ($id_agents, 'id_agente_modulo',
array ('nombre' => $module_name), true);
$success = delete_agent_module ($modules);
if (! $success) {
echo '<h3 class="error">'.__('There was an error deleting the module, the operation has been cancelled').'</h3>';
echo '<h4>'.__('Could not delete module').' '.get_agentmodule_name ($id_module).'</h4>';
echo '<h3 class="error">'.__('There was an error deleting the modules, the operation has been cancelled').'</h3>';
echo '<h4>'.__('Could not delete modules').'</h4>';
process_sql_rollback ();
} else {
echo '<h3 class="suc">'.__('Successfully deleted').'</h3>';
@ -56,13 +75,13 @@ function process_manage_delete ($id_modules) {
}
$id_group = (int) get_parameter ('id_group');
$id_agent = (int) get_parameter ('id_agent');
$id_modules = get_parameter ('id_modules');
$id_agents = (array) get_parameter ('id_agents');
$module_name = (string) get_parameter ('module_name');
$delete = (bool) get_parameter_post ('delete');
if ($delete) {
process_manage_delete ($id_modules);
process_manage_delete ($module_name, $id_agents);
}
$groups = get_user_groups ();
@ -78,26 +97,27 @@ $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] = __('Modules');
$modules = array ();
$modules = get_db_all_rows_filter ('tagente_modulo', false, 'DISTINCT(nombre)');
$table->data[0][1] = print_select (index_array ($modules, 'nombre', 'nombre'),
'module_name', $module_name, false, __('Select'), '', true);
$table->data[2][0] = __('Modules');
$table->data[2][0] .= '<span id="module_loading" class="invisible">';
$table->data[1][0] = __('Group');
$table->data[1][1] = print_select ($groups, 'id_group', $id_group,
false, '', '', true, false, true, '', empty ($module_name));
$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>';
$modules = array ();
if ($id_agent)
$modules = get_agent_modules ($id_agent, false, array ('disabled' => 0));
$table->data[2][1] = print_select ($modules,
'id_modules[]', 0, false, '', '', true, true);
$agents = get_agents_with_module_name ($module_name, $id_group,
array ('delete_pending' => 0,
'`tagente_modulo`.disabled' => 0),
array ('tagente.id_agente', 'tagente.nombre'));
$table->data[2][1] = print_select (index_array ($agents, 'id_agente', 'nombre'),
'id_agents[]', 0, false, __('None'), 0, true, true, true, '', empty ($module_name));
echo '<form method="post" onsubmit="if (! confirm(\''.__('Are you sure').'\')) return false;">';
print_table ($table);
@ -117,10 +137,39 @@ require_jquery_file ('pandora.controls');
<script type="text/javascript">
/* <![CDATA[ */
$(document).ready (function () {
$("#id_group").pandoraSelectGroupAgent ();
$("#id_agent").pandoraSelectAgentModule ({
moduleSelect: "select#id_modules"
$("#module_name").change (function () {
if (this.value != "") {
$("#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", $select).remove ();
jQuery.post ("ajax.php",
{"page" : "godmode/agentes/massive_delete_modules",
"get_agents" : 1,
"id_group" : this.value,
"module_name" : $("#module_name").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"
);
});
});
/* ]]> */
</script>

BIN
pandora_console/images/download.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 461 B

BIN
pandora_console/images/note.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 500 B

After

Width:  |  Height:  |  Size: 667 B

BIN
pandora_console/images/star.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 676 B

2
pandora_console/include/functions_alerts.php
View File

@ -805,7 +805,7 @@ function get_agents_with_alert_template ($id_alert_template, $id_group, $filter
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_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"));

23
pandora_console/include/functions_modules.php
View File

@ -321,4 +321,27 @@ function create_agent_module ($id_agent, $name, $values = false) {
return $id_agent_module;
}
/**
* Gets all the agents that have a module with a name given.
*
* @param string Module name.
* @param int Group id of the agents. False will be any group.
* @param array Extra filter.
* @param mixed Fields to be returned. All agents field by default
*
* @return array All the agents which have a module with the name given.
*/
function get_agents_with_module_name ($module_name, $id_group, $filter = false, $fields = 'tagente.*') {
if (empty ($module_name))
return false;
if (! is_array ($filter))
$filter = array ();
$filter[] = 'tagente_modulo.id_agente = tagente.id_agente';
$filter['`tagente_modulo`.nombre'] = $module_name;
$filter['`tagente`.id_agente'] = array_keys (get_group_agents ($id_group, false, "none"));
return get_db_all_rows_filter ('tagente, tagente_modulo',
$filter, $fields);
}
?>