Resolve macros when accessing getters on MonitoredObjects

refs #6392
Icinga · May 28, 2015 · a669491 · a669491
1 parent 37f58e5
commit a669491
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -1,16 +1,11 @@
 <?php
-use Icinga\Module\Monitoring\Object\MonitoredObject;
 
 // add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
 $newTabInfo = sprintf('<span class="info-box display-on-hover"> %s </span>', $this->translate('opens in new window'));
 
-$links = MonitoredObject::parseAttributeUrls($object->action_url);
+$links = $object->getActionUrls();
 foreach ($links as $i => $link) {
-    $links[$i] = sprintf(
-        '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>',
-        $this->resolveMacros($object->action_url, $object),
-        'Action'
-    );
+    $links[$i] = sprintf('<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>', $link, 'Action');
 }
 
 if (isset($this->actions)) {

diff --git a/modules/monitoring/application/views/scripts/show/components/notes.phtml b/modules/monitoring/application/views/scripts/show/components/notes.phtml
@@ -1,15 +1,13 @@
 <?php
 $notes = trim($object->getNotes());
 $links = $object->getNotesUrls();
-?>
 
-<?php if (! empty($links) || ! empty($notes)): ?>
+if (! empty($links) || ! empty($notes)): ?>
 <tr>
     <th><?= $this->translate('Notes') ?></th>
     <td>
         <?php
             if (! empty($notes)) {
-                $notes = $this->resolveMacros($notes, $object);
                 echo $notes . '<br>';
             }
             // add warning to links that open in new tabs to improve accessibility, as recommended by WCAG20 G201
@@ -19,8 +17,7 @@ $links = $object->getNotesUrls();
             );
             $linkText = '<a href="%s" target="_blank">%s ' . $newTabInfo . '</a>';
             foreach ($links as $i => $link) {
-                $resolved = $this->resolveMacros($link, $object);
-                $links[$i] = sprintf($linkText, $this->escape($resolved), $this->escape($resolved));
+                $links[$i] = sprintf($linkText, $this->escape($link), $this->escape($link));
             }
             echo implode('<br>', $links);
         ?>

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -192,7 +192,9 @@ public static function getStateText($state, $translate = false)
 
     public function getNotesUrls()
     {
-        return MonitoredObject::parseAttributeUrls($this->host_notes_url);
+        return $this->resolveAllStrings(
+            MonitoredObject::parseAttributeUrls($this->host_notes_url)
+        );
     }
 
     public function getNotes()

diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -569,14 +569,14 @@ public static function fromParams(UrlParams $params)
      *
      * @return string   The notes as a string
      */
-    public function getNotes() {}
+    public abstract function getNotes();
 
     /**
      * Get all note urls configured for this monitored object
      *
      * @return array    All note urls as a string
      */
-    public function getNotesUrls() {}
+    public abstract function getNotesUrls();
 
     /**
      * Get all action urls configured for this monitored object
@@ -585,7 +585,23 @@ public function getNotesUrls() {}
      */
     public function getActionUrls()
     {
-        return MonitoredObject::parseAttributeUrls($this->action_url);
+        return $this->resolveAllStrings(
+            MonitoredObject::parseAttributeUrls($this->action_url)
+        );
+    }
+
+    /**
+     * Resolve macros in all given strings in the current object context
+     *
+     * @param   array   $strs   An array of urls as string
+     * @return  type
+     */
+    protected function resolveAllStrings(array $strs)
+    {
+        foreach ($strs as $i => $str) {
+            $strs[$i] = Macro::resolveMacros($str, $this);
+        }
+        return $strs;
     }
 
     /**

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -202,7 +202,9 @@ public static function getStateText($state, $translate = false)
 
     public function getNotesUrls()
     {
-        return MonitoredObject::parseAttributeUrls($this->service_notes_url);
+        return $this->resolveAllStrings(
+            MonitoredObject::parseAttributeUrls($this->service_notes_url)
+        );
     }
 
     public function getNotes()