Implement CONTACTEMAIL and CONTACTPAGER macros.

diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 649792422d94e5d4c76bc150cf8ff62fcb7a65ff..2cda97928362974c266654ba5b4727496f25d834 100644 (file)
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -128,10 +128,19 @@ bool User::ResolveMacro(const String& macro, const Dictionary::Ptr&, String *res
                *result = GetDisplayName();
                return true;
        } else {
+               String tmacro;
+
+               if (macro == "CONTACTEMAIL")
+                       tmacro = "email";
+               else if (macro == "CONTACTPAGER")
+                       tmacro = "pager";
+               else
+                       tmacro = macro;
+
                Dictionary::Ptr macros = GetMacros();
 
-               if (macros && macros->Contains(macro)) {
-                       *result = macros->Get(macro);
+               if (macros && macros->Contains(tmacro)) {
+                       *result = macros->Get(tmacro);
                        return true;
                }