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

2011-08-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_alerts.php: Fixed alerts_get_agents_with_alert_template
        function in order to not retrieve delete modules.

        Fixes: #3401666




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4862 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-08-31 15:22:44 +00:00
parent 149e5f5f57
commit 624c2edaff
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-08-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_alerts.php: Fixed alerts_get_agents_with_alert_template
function in order to not retrieve delete modules.
Fixes: #3401666
2011-08-31 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/lib/libupdate_manager_client.php,

2
pandora_console/include/functions_alerts.php
View File

@ -1587,6 +1587,8 @@ function alerts_get_agents_with_alert_template ($id_alert_template, $id_group, $
$filter[] = 'tagente_modulo.id_agente_modulo = talert_template_modules.id_agent_module';
$filter[] = 'tagente_modulo.id_agente = tagente.id_agente';
$filter['id_alert_template'] = $id_alert_template;
$filter['tagente_modulo.disabled'] = '<> 1';
$filter['delete_pending'] = '<> 1';
if (empty ($id_agents)) {
switch ($config["dbtype"]) {
case "mysql":