From b5d4fdabb6b0ae4420f599c0ce20ad38cfc2f806 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sun, 30 Jun 2013 19:54:49 +0000
Subject: [PATCH] devStateIcon {}: returned html may contain newlines Color for
 SVG: multiple fill lines accepted

git-svn-id: https://svn.fhem.de/fhem/trunk@3374 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 05f39ae44..cab77ebf0 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -125,7 +125,8 @@ FHEMWEB_Initialize($)
 
   ###############
   # Initialize internal structures
-  map { addToAttrList($_) } ( "webCmd", "icon", "devStateIcon", "sortby", "devStateStyle");
+  map { addToAttrList($_) } ( "webCmd", "icon", "devStateIcon",
+                                "sortby", "devStateStyle");
   InternalTimer(time()+60, "FW_closeOldClients", 0, 0);
   
   $FW_dir      = "$attr{global}{modpath}/www";
@@ -2079,9 +2080,9 @@ FW_makeImage(@)
       if($col) {
         $col =~ s/@//;
         $col = "#$col" if($col =~ m/^([A-F0-9]{6})$/);
-        $data =~ s/fill="#000000"/fill="$col"/;
+        $data =~ s/fill="#000000"/fill="$col"/g;
       } else {
-        $data =~ s/fill="#000000"//;
+        $data =~ s/fill="#000000"//g;
       }
       return $data;
     } else {
@@ -2263,7 +2264,7 @@ FW_dev2image($)
   if(defined($devStateIcon) && $devStateIcon =~ m/^{.*}$/) {
     my ($html, $link) = eval $devStateIcon;
     Log 1, "devStateIcon $name: $@" if($@);
-    return ($html, $link, 1) if(defined($html) && $html =~ m/^<.*>$/);
+    return ($html, $link, 1) if(defined($html) && $html =~ m/^<.*>$/s);
     $devStateIcon = $html;
   }