tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-05-11 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* include/functions_agents.php: added hooks for to enterprise ACL.

	* extensions/module_groups.php: cleaned source code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4334 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-05-11 09:08:47 +00:00
parent 6efb3aa7ca
commit 13a7470897
4 changed files with 23 additions and 4 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 @@
2011-05-11 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: added hooks for to enterprise ACL.
* extensions/module_groups.php: cleaned source code.
2011-05-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php

1
pandora_console/extensions/module_groups.php
View File

@ -160,6 +160,7 @@ function mainModuleGroups() {
$agents = agents_get_group_agents($idAgentGroup);
if (!empty($agents)) {
$alerts = agents_get_alerts_simple($agents);

9
pandora_console/include/functions_agents.php
View File

@ -818,6 +818,15 @@ function agents_get_group_agents ($id_group = 0, $search = false, $case = "lower
$search_sql .= ' AND disabled = 0';
}
//Add enterprise function to add other enterprise ACL.
if (ENTERPRISE_NOT_HOOK !== enterprise_include_once('include/functions_policies.php')) {
$operator = 'AND';
if (empty($search_sql))
$operator = '';
$search_sql .= subquery_acl_enterprise($operator);
}
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":

3
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -21,10 +21,13 @@ global $config;
require_once ("include/functions_agents.php");
require_once ($config["homedir"] . '/include/functions_graph.php');
include_graphs_dependencies();
require_once ($config['homedir'] . '/include/functions_groups.php');
check_login ();
$id_agente = get_parameter_get ("id_agente", -1);
$agent = db_get_row ("tagente", "id_agente", $id_agente);