tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-07-21 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* operation/agentes/status_monitor.php: Fixed an empty group check
	and a subquery_enterprise not exist variables for bug 3371206



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-07-21 09:47:02 +00:00
parent e56a79a69e
commit 07bf8db69c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-07-21 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/status_monitor.php: Fixed an empty group check
and a subquery_enterprise not exist variables for bug 3371206
2011-07-21 Ramon Novoa <rnovoa@artica.es> 2011-07-21 Ramon Novoa <rnovoa@artica.es>
* extras/pandoradb_migrate_v3.2_to_v4.0.sql: Removed already existing * extras/pandoradb_migrate_v3.2_to_v4.0.sql: Removed already existing

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

@ -39,6 +39,10 @@ if (ENTERPRISE_NOT_HOOK !== $isFunctionPolicies) {
$subquery_enterprise = subquery_acl_enterprise(); $subquery_enterprise = subquery_acl_enterprise();
$subquery_enterprise2 = subquery_acl_enterprise('AND', 'tagente.id_agente'); $subquery_enterprise2 = subquery_acl_enterprise('AND', 'tagente.id_agente');
} }
else {
$subquery_enterprise = '';
$subquery_enterprise2 = '';
}
ui_print_page_header ("Monitor detail", "images/brick.png", false); ui_print_page_header ("Monitor detail", "images/brick.png", false);
@ -200,7 +204,7 @@ $sql = " FROM tagente, tagente_modulo, tagente_estado
if ($ag_group > 0 && check_acl ($config["id_user"], $ag_group, "AR")) { if ($ag_group > 0 && check_acl ($config["id_user"], $ag_group, "AR")) {
$sql .= sprintf (" AND tagente.id_grupo = %d", $ag_group); $sql .= sprintf (" AND tagente.id_grupo = %d", $ag_group);
} }
else { elseif($user_groups != '') {
// User has explicit permission on group 1 ? // User has explicit permission on group 1 ?
$sql .= " AND tagente.id_grupo IN (".$user_groups.")"; $sql .= " AND tagente.id_grupo IN (".$user_groups.")";
} }