announcements: Transform markdown markup

Icinga · Jun 25, 2019 · c6a61f9 · c6a61f9
1 parent 6c54dc8
commit c6a61f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/library/Icinga/Web/Widget/Announcements.php b/library/Icinga/Web/Widget/Announcements.php
@@ -8,7 +8,7 @@
 use Icinga\Forms\Announcement\AcknowledgeAnnouncementForm;
 use Icinga\Web\Announcement\AnnouncementCookie;
 use Icinga\Web\Announcement\AnnouncementIniRepository;
-use Icinga\Web\Helper\HtmlPurifier;
+use Icinga\Web\Helper\Markdown;
 
 /**
  * Render announcements
@@ -36,13 +36,12 @@ public function render()
         $announcements = $repo->findActive();
         $announcements->applyFilter($acked);
         if ($announcements->hasResult()) {
-            $purifier = new HtmlPurifier(array('HTML.Allowed' => 'b,a[href|target],i,*[class]'));
             $html = '<ul role="alert" id="announcements">';
             foreach ($announcements as $announcement) {
                 $ackForm = new AcknowledgeAnnouncementForm();
                 $ackForm->populate(array('hash' => $announcement->hash));
                 $html .= '<li><div>'
-                    . $purifier->purify($announcement->message)
+                    . Markdown::text($announcement->message)
                     . '</div>'
                     . $ackForm
                     . '</li>';

diff --git a/library/Icinga/Web/Widget/ApplicationStateMessages.php b/library/Icinga/Web/Widget/ApplicationStateMessages.php
@@ -8,7 +8,7 @@
 use Icinga\Authentication\Auth;
 use Icinga\Forms\AcknowledgeApplicationStateMessageForm;
 use Icinga\Web\ApplicationStateCookie;
-use Icinga\Web\Helper\HtmlPurifier;
+use Icinga\Web\Helper\Markdown;
 
 /**
  * Render application state messages
@@ -27,12 +27,6 @@ protected function getMessages()
         return $active;
     }
 
-
-    protected function getPurifier()
-    {
-        return new HtmlPurifier(['HTML.Allowed' => 'b,a[href|target],i,*[class]']);
-    }
-
     public function render()
     {
         $enabled = Auth::getInstance()
@@ -55,8 +49,6 @@ public function render()
             return '<div style="display: none;"></div>';
         }
 
-        $purifier = $this->getPurifier();
-
         $html = '<div>';
 
         reset($active);
@@ -69,7 +61,7 @@ public function render()
         $ackForm = new AcknowledgeApplicationStateMessageForm();
         $ackForm->populate(['id' => $id]);
 
-        $html .= $purifier->purify($message) . $ackForm;
+        $html .= Markdown::text($message) . $ackForm;
 
         $html .= '</div>';