From bc187d91c59741c93219283c4c552e77df44c015 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 Jan 2016 13:33:22 +0100
Subject: [PATCH] monitoring: Make inline pie charts accessible

---
 library/Icinga/Web/Widget/Chart/InlinePie.php             | 6 +++---
 modules/monitoring/application/views/helpers/Perfdata.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php
index cb5ff670b..991f2eb46 100644
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@@ -74,14 +74,14 @@ class InlinePie extends AbstractWidget
      * @var string
      */
     private $template =<<<'EOD'
-<span sparkType="pie" class="sparkline {class}" {title} sparkSliceColors="[{colors}]" values="{data}">
+<span sparkType="pie" class="sparkline {class}" title="{title}" role="img" aria-label="{title}" sparkSliceColors="[{colors}]" values="{data}">
 </span>
 {noscript}
 EOD;
 
     private $noscript =<<<'EOD'
 <noscript>
-  <img width={size} height={size} class="inlinepie {class}" {title} src="{url}" data-icinga-colors="{colors}" data-icinga-values="{data}"/>
+  <img width={size} height={size} class="inlinepie {class}" title="{title}" role="img" aria-label="{title}" src="{url}" data-icinga-colors="{colors}" data-icinga-values="{data}"/>
 </noscript>
 EOD;
 
@@ -196,7 +196,7 @@ EOD;
      */
     public function setTitle($title)
     {
-        $this->title = 'title="' .  htmlspecialchars($title) . '"';
+        $this->title = $this->view()->escape($title);
         return $this;
     }
 
diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 0ed5ccb95..a68a87279 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -95,7 +95,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
                 if ($compact) {
                     $results = array_slice($results, 0, $limit);
                     $title = sprintf($this->view->translate('%d more ...'), $count - $limit);
-                    $results[] = '<span title="' . $title . '">...</span>';
+                    $results[] = '<span aria-hidden="true" title="' . $title . '">...</span>';
                 } else {
                     $table = array_slice($table, 0, $limit);
                 }