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

2010-08-31 Sergio Martin <sergio.martin@artica.es> 

* operation/agentes/status_monitor.php: Fixed the 
	modules combo in the status monitor screen to 
	show only the visible agents modules



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3205 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-08-31 10:53:10 +00:00
parent 55e88c3660
commit 26e911a8c4
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2010-08-31 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/status_monitor.php: Fixed the
modules combo in the status monitor screen to
show only the visible agents modules
2010-08-31 Sergio Martin <sergio.martin@artica.es>
* include/functions_db.php: Added support to '<>'

7
pandora_console/operation/agentes/status_monitor.php
View File

@ -69,7 +69,10 @@ print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name",
echo '</tr><tr><td valign="middle">'.__('Module name').'</td>';
echo '<td valign="middle">';
$modules = get_db_all_rows_filter ('tagente_modulo', false, 'DISTINCT(nombre)');
$user_groups = implode (",", array_keys (get_user_groups ()));
$user_agents = implode (",", array_keys (get_group_agents($user_groups)));
$modules = get_db_all_rows_filter ('tagente_modulo', array('id_agente' => $user_agents, 'nombre' => '<>delete_pending'), 'DISTINCT(nombre)');
print_select (index_array ($modules, 'nombre', 'nombre'), "ag_modulename",
$ag_modulename, 'this.form.submit();', __('All'), '', false, false, true, '', false, 'width: 150px;');
@ -96,7 +99,7 @@ if ($ag_group > 0 && give_acl ($config["id_user"], $ag_group, "AR")) {
$sql .= sprintf (" AND tagente.id_grupo = %d", $ag_group);
} else {
// User has explicit permission on group 1 ?
$sql .= " AND tagente.id_grupo IN (".implode (",", array_keys (get_user_groups ())).")";
$sql .= " AND tagente.id_grupo IN (".$user_groups.")";
}
// Module group