diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | include/functions.c | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -1,5 +1,6 @@ Changes for 1.0beta14: + - added substitution of macros for all actions (Alexei) - added escaping of 'special' characters before SQL insert statements (Alexei) - fixed removal of sysmaps hosts and links when deleting item (Alexei) diff --git a/include/functions.c b/include/functions.c index 8e407933..70e137ec 100644 --- a/include/functions.c +++ b/include/functions.c @@ -922,6 +922,9 @@ void apply_actions(DB_TRIGGER *trigger,int good) } strscpy(action.message,action.subject); + substitute_macros(trigger, &action, action.message); + substitute_macros(trigger, &action, action.subject); + /* substitute_hostname(trigger->triggerid,action.message); substitute_hostname(trigger->triggerid,action.subject);*/ } @@ -944,6 +947,9 @@ void apply_actions(DB_TRIGGER *trigger,int good) } strscpy(action.message,action.subject); + substitute_macros(trigger, &action, action.message); + substitute_macros(trigger, &action, action.subject); + /* substitute_hostname(trigger->triggerid,action.message); substitute_hostname(trigger->triggerid,action.subject);*/ } |