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

2012-01-18 Vanessa Gil <vanessa.gil@artica.es> 

* include/functions_agents.php
	  operation/agentes/estado_monitores.php: Counter modified to ignore
	disabled modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-01-18 10:09:58 +00:00
parent f4d2c55dec
commit f5eb6a24f0
3 changed files with 10 additions and 3 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 @@
2012-01-18 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php
operation/agentes/estado_monitores.php: Counter modified to ignore
disabled modules.
2012-01-18 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_pcap_filter.php: Added a new help file.

4
pandora_console/include/functions_agents.php
View File

@ -192,7 +192,7 @@ function agents_get_alerts_simple ($id_agent = false, $filter = '', $options = f
$selectText = 'COUNT(talert_template_modules.id) AS count';
}
$extra_sql = enterprise_hook('policies_get_modules_sql_condition', array(reset($id_agent), 't3.'));
$extra_sql = enterprise_hook('policies_get_modules_sql_condition', array(reset($id_agent), 't3.', false));
if ($extra_sql === ENTERPRISE_NOT_HOOK) {
$extra_sql = '';
}else if ($extra_sql != '') {
@ -981,7 +981,7 @@ function agents_get_modules ($id_agent = null, $details = false, $filter = false
$extra_sql = '';
if ($id_agent != 0){
$extra_sql = enterprise_hook('policies_get_modules_sql_condition', array($id_agent));
$extra_sql = enterprise_hook('policies_get_modules_sql_condition', array($id_agent, '', false));
if ($extra_sql === ENTERPRISE_NOT_HOOK) {
$extra_sql = '';
}else if ($extra_sql != '') {

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

@ -178,7 +178,7 @@ switch ($config["dbtype"]) {
ORDER BY tagente_modulo.id_module_group , %s %s
", $id_agente, $order['field'], $order['order']); */
$sql = sprintf("
SELECT * FROM tagente_estado, (SELECT * FROM tagente_modulo WHERE id_agente = %d AND delete_pending = 0) tagente_modulo
SELECT * FROM tagente_estado, (SELECT * FROM tagente_modulo WHERE id_agente = %d AND delete_pending = 0 AND disabled = 0) tagente_modulo
LEFT JOIN tmodule_group ON tagente_modulo.id_module_group = tmodule_group.id_mg
WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
AND %s tagente_estado.utimestamp != 0
@ -198,6 +198,7 @@ switch ($config["dbtype"]) {
WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
AND tagente_modulo.id_agente = %d
AND tagente_modulo.delete_pending = 0
AND tagente_modulo.disabled = 0
AND tagente_estado.utimestamp != 0
ORDER BY tagente_modulo.id_module_group , %s %s
", $id_agente, $order['field'], $order['order']);