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

2011-09-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_alerts.php: fixed alerts_get_alert_agent_module_actions()
        function to avoid PHP warnings on alert compound display.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4890 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-09-02 09:42:20 +00:00
parent 4107ecca62
commit 78a28691e3
2 changed files with 7 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 @@
2011-09-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_alerts.php: fixed alerts_get_alert_agent_module_actions()
function to avoid PHP warnings on alert compound display.
2011-09-02 Junichi Satoh <junichi@rworks.jp>
* godmode/massive/massive_add_action_alerts.php,

3
pandora_console/include/functions_alerts.php
View File

@ -1120,7 +1120,8 @@ function alerts_get_alert_agent_module_actions ($id_alert_agent_module, $fields
$action = alerts_get_alert_action ($element['id_alert_action']);
$action['fires_min'] = $element['fires_min'];
$action['fires_max'] = $element['fires_max'];
$action['module_action_threshold'] = $element['module_action_threshold'];
if (!$compound)
$action['module_action_threshold'] = $element['module_action_threshold'];
if (isset($element['id']))
$retval[$element['id']] = $action;
}