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

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.



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
pandora_console
ChangeLog
extensions
module_groups.php
include
functions_agents.php
operation/agentes
estado_generalagente.php

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> 2011-05-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php * include/functions_graph.php

3
pandora_console/extensions/module_groups.php
View File

@ -155,11 +155,12 @@ function mainModuleGroups() {
foreach ($modelGroups as $idModelGroup => $modelGroup) { foreach ($modelGroups as $idModelGroup => $modelGroup) {
$query = sprintf($sql,$idAgentGroup, $idModelGroup); $query = sprintf($sql,$idAgentGroup, $idModelGroup);
$rowsDB = db_get_all_rows_sql ($query); $rowsDB = db_get_all_rows_sql ($query);
$agents = agents_get_group_agents($idAgentGroup); $agents = agents_get_group_agents($idAgentGroup);
if (!empty($agents)) { if (!empty($agents)) {
$alerts = agents_get_alerts_simple($agents); $alerts = agents_get_alerts_simple($agents);

15
pandora_console/include/functions_agents.php
View File

@ -817,7 +817,16 @@ function agents_get_group_agents ($id_group = 0, $search = false, $case = "lower
else { else {
$search_sql .= ' AND disabled = 0'; $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"]) { switch ($config["dbtype"]) {
case "mysql": case "mysql":
case "postgresql": case "postgresql":
@ -827,11 +836,11 @@ function agents_get_group_agents ($id_group = 0, $search = false, $case = "lower
$sql = sprintf ("SELECT id_agente, nombre FROM tagente %s ORDER BY dbms_lob.substr(nombre,4000,1)", $search_sql); $sql = sprintf ("SELECT id_agente, nombre FROM tagente %s ORDER BY dbms_lob.substr(nombre,4000,1)", $search_sql);
break; break;
} }
$result = db_get_all_rows_sql ($sql); $result = db_get_all_rows_sql ($sql);
if ($result === false) if ($result === false)
return array (); //Return an empty array return array (); //Return an empty array
$agents = array (); $agents = array ();
foreach ($result as $row) { foreach ($result as $row) {

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

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