fixes #3799 apply colors to exception message

matomo-org · Apr 20, 2013 · 25a5ac6 · 25a5ac6
1 parent a63e6ca
commit 25a5ac6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php
@@ -482,6 +482,7 @@ public function get(
             $graph->setHeight($height);
             $graph->setFont($font);
             $graph->setFontSize($fontSize);
+            $graph->setBackgroundColor($backgroundColor);
             $graph->setTextColor($textColor);
             $graph->setException($e);
             $graph->renderGraph();

diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
@@ -317,6 +317,17 @@ protected function getMaximumTextWidthHeight($values)
         return array($maxWidth, $maxHeight);
     }
 
+    protected function drawBackground()
+    {
+        $this->pImage->drawFilledRectangle(
+            0,
+            0,
+            $this->width,
+            $this->height,
+            array_merge(array('Alpha' => 100), $this->backgroundColor)
+        );
+    }
+
     private static function hex2rgb($hexColor)
     {
         if (preg_match('/([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/', $hexColor, $matches)) {

diff --git a/plugins/ImageGraph/StaticGraph/Exception.php b/plugins/ImageGraph/StaticGraph/Exception.php
@@ -64,10 +64,13 @@ public function renderGraph()
 
         $this->initpImage();
 
+        $this->drawBackground();
+
         $this->pImage->drawText(
             0,
             $textHeight,
-            $message
+            $message,
+            $this->textColor
         );
     }
 }
diff --git a/plugins/ImageGraph/StaticGraph/GridGraph.php b/plugins/ImageGraph/StaticGraph/GridGraph.php
@@ -83,14 +83,7 @@ protected function initGridChart(
         $bottomRightXValue = $this->width - $this->getGridRightMargin($horizontalGraph);
         $bottomRightYValue = $this->getGraphBottom($horizontalGraph);
 
-        // background color
-        $this->pImage->drawFilledRectangle(
-            0,
-            0,
-            $this->width,
-            $this->height,
-            array_merge(array('Alpha' => 100), $this->backgroundColor)
-        );
+        $this->drawBackground();
 
         $this->pImage->setGraphArea(
             $topLeftXValue,