From 6f36891d37ea527773e32eb94e15722fbff39b6d Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Tue, 19 Nov 2013 13:44:02 +0000
Subject: [PATCH] fhem.pl: newline-escaping-fix, FHEMWEB: column fix

git-svn-id: https://svn.fhem.de/fhem/trunk@4251 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm     | 2 +-
 fhem/fhem.pl                | 3 ++-
 fhem/www/pgm2/darkstyle.css | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 40a65588c..33be655a7 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -1221,7 +1221,7 @@ FW_parseColumns()
   my %columns;
   my $colNo = -1;
 
-  foreach my $roomgroup (split("[ \t][ \t]*", AttrVal($FW_wname,"column",""))) {
+  foreach my $roomgroup (split("[ \t\r\n]+", AttrVal($FW_wname,"column",""))) {
     my ($room, $groupcolumn)=split(":",$roomgroup);
     last if(!defined($room) || !defined($groupcolumn));
     next if($room ne $FW_room);
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 036c368d0..a885df01c 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -979,7 +979,7 @@ CommandInclude($$)
     $l =~ s/[\r\n]//g;
 
     if($l =~ m/^(.*)\\ *$/) {		# Multiline commands
-      $bigcmd .= "$1\\\n";
+      $bigcmd .= "$1\n";
     } else {
       my $tret = AnalyzeCommandChain($cl, $bigcmd . $l);
       push @ret, $tret if(defined($tret));
@@ -1215,6 +1215,7 @@ CommandSave($$)
       my $def = $defs{$d}{DEF};
       if(defined($def)) {
         $def =~ s/;/;;/g;
+        $def =~ s/\n/\\\n/g;
         print $fh "define $d $defs{$d}{TYPE} $def\n";
       } else {
         print $fh "define $d $defs{$d}{TYPE}\n";
diff --git a/fhem/www/pgm2/darkstyle.css b/fhem/www/pgm2/darkstyle.css
index 73122690c..f28080f2c 100644
--- a/fhem/www/pgm2/darkstyle.css
+++ b/fhem/www/pgm2/darkstyle.css
@@ -17,6 +17,7 @@ table.block tr.odd { background: #111111; }
 table.block tr.sel { background: red; }
 table { border-radius:8px; border-spacing: 0px;
        padding-bottom: 6px; padding-top: 6px; }
+table.column { border-spacing: 5px; }
 
 table.room { background: #111111; width: 140px; border:1px solid #CCCCCC; box-shadow:5px 5px 5px #000;}
 table.room a { color: #CCCCCC; text-decoration: none; }