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

Added tag filter to module massive operations (edit and modules selection first)

This commit is contained in:
Arturo Gonzalez 2017-05-17 09:59:10 +02:00
parent 1361ecd2e9
commit 4b94e7ce2b
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -719,7 +719,7 @@ $(document).ready (function () {
var params = { var params = {
"page" : "operation/agentes/ver_agente", "page" : "operation/agentes/ver_agente",
"get_agent_modules_json" : 1, "get_agent_modules_json" : 1,
"get_distinct_name" : 1, "get_id_and_name" : 1,
"indexed" : 0 "indexed" : 0
}; };

33
pandora_console/operation/agentes/ver_agente.php
View File

@ -551,7 +551,7 @@ if (is_ajax ()) {
$status_modulo = (int) get_parameter ('status_module', -1); $status_modulo = (int) get_parameter ('status_module', -1);
$tags = (array) get_parameter ('tags', array()); $tags = (array) get_parameter ('tags', array());
// Filter // Filter
$filter = array(); $filter = array();
if ($disabled !== -1) if ($disabled !== -1)
@ -631,7 +631,7 @@ if (is_ajax ()) {
agents_get_group_agents( agents_get_group_agents(
array_keys (users_get_groups ()), $search, "none")); array_keys (users_get_groups ()), $search, "none"));
$agent_modules = agents_get_modules ($id_agent, $fields, $filter, $indexed); $agent_modules = agents_get_modules ($id_agent, $fields, $filter, $indexed, true, false, $tags);
} }
// Restore db connection // Restore db connection
metaconsole_restore_db(); metaconsole_restore_db();
@ -644,20 +644,39 @@ if (is_ajax ()) {
agents_get_group_agents( agents_get_group_agents(
array_keys(users_get_groups ()), $search, "none")); array_keys(users_get_groups ()), $search, "none"));
$agent_modules = agents_get_modules ($id_agent, $fields, $filter, $indexed); $agent_modules = agents_get_modules ($id_agent, $fields, $filter, $indexed, true, false, $tags);
} }
if (empty($agent_modules)) if (empty($agent_modules))
$agent_modules = array(); $agent_modules = array();
if (!empty($tags)) {
$implode_tags = implode(",", $tags);
$tag_modules = db_get_all_rows_sql("SELECT DISTINCT id_agente_modulo FROM ttag_module WHERE id_tag IN (" . $implode_tags . ")");
if ($tag_modules) {
$final_modules = array();
foreach ($agent_modules as $key => $module) {
$in_array = false;
foreach ($tag_modules as $t_module) {
if ($module['id_agente_modulo'] == $t_module['id_agente_modulo']) {
$in_array = true;
}
}
if ($in_array) {
$final_modules[] = $module;
}
}
$agent_modules = $final_modules;
}
else {
$agent_modules = array();
}
}
foreach ($agent_modules as $key => $module) { foreach ($agent_modules as $key => $module) {
$agent_modules[$key]['nombre'] = io_safe_output($module['nombre']); $agent_modules[$key]['nombre'] = io_safe_output($module['nombre']);
} }
//Hack to translate text "any" in PHP to javascript
//$agent_modules['any_text'] = __('Any');
echo json_encode ($agent_modules); echo json_encode ($agent_modules);
return; return;