FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 18:56:03 +00:00
Code Issues Releases Wiki Activity

fhem.pl: newline-escaping-fix, FHEMWEB: column fix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4251 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-11-19 13:44:02 +00:00
parent ae38d12525
commit 6f36891d37
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1221,7 +1221,7 @@ FW_parseColumns()
my %columns; my %columns;
my $colNo = -1; 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); my ($room, $groupcolumn)=split(":",$roomgroup);
last if(!defined($room) || !defined($groupcolumn)); last if(!defined($room) || !defined($groupcolumn));
next if($room ne $FW_room); next if($room ne $FW_room);

3
fhem/fhem.pl
View File

@ -979,7 +979,7 @@ CommandInclude($$)
$l =~ s/[\r\n]//g; $l =~ s/[\r\n]//g;
if($l =~ m/^(.*)\\ *$/) { # Multiline commands if($l =~ m/^(.*)\\ *$/) { # Multiline commands
$bigcmd .= "$1\\\n"; $bigcmd .= "$1\n";
} else { } else {
my $tret = AnalyzeCommandChain($cl, $bigcmd . $l); my $tret = AnalyzeCommandChain($cl, $bigcmd . $l);
push @ret, $tret if(defined($tret)); push @ret, $tret if(defined($tret));
@ -1215,6 +1215,7 @@ CommandSave($$)
my $def = $defs{$d}{DEF}; my $def = $defs{$d}{DEF};
if(defined($def)) { if(defined($def)) {
$def =~ s/;/;;/g; $def =~ s/;/;;/g;
$def =~ s/\n/\\\n/g;
print $fh "define $d $defs{$d}{TYPE} $def\n"; print $fh "define $d $defs{$d}{TYPE} $def\n";
} else { } else {
print $fh "define $d $defs{$d}{TYPE}\n"; print $fh "define $d $defs{$d}{TYPE}\n";

1
fhem/www/pgm2/darkstyle.css
View File

@ -17,6 +17,7 @@ table.block tr.odd { background: #111111; }
table.block tr.sel { background: red; } table.block tr.sel { background: red; }
table { border-radius:8px; border-spacing: 0px; table { border-radius:8px; border-spacing: 0px;
padding-bottom: 6px; padding-top: 6px; } 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 { background: #111111; width: 140px; border:1px solid #CCCCCC; box-shadow:5px 5px 5px #000;}
table.room a { color: #CCCCCC; text-decoration: none; } table.room a { color: #CCCCCC; text-decoration: none; }