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

2012-05-09 Sergio Martin <sergio.martin@artica.es> 

* include/functions_agents.php: Merged from 4.0 the extra_sql
	get code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6277 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-05-09 16:13:31 +00:00
parent 535b4b642d
commit 007e4b389a
2 changed files with 11 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 @@
2012-05-09 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php: Merged from 4.0 the extra_sql
get code
2012-05-09 Sergio Martin <sergio.martin@artica.es> 2012-05-09 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_alert_macros.php * include/help/en/help_alert_macros.php

7
pandora_console/include/functions_agents.php
View File

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