From 62d95242f2672f1572f99c5ed96da46911eb5111 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Wed, 12 Aug 2009 07:25:20 +0000 Subject: [PATCH] Fixes for windows git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@422 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- webfrontend/pgm2/01_FHEMWEB.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webfrontend/pgm2/01_FHEMWEB.pm b/webfrontend/pgm2/01_FHEMWEB.pm index a336e69c5..485fed74b 100755 --- a/webfrontend/pgm2/01_FHEMWEB.pm +++ b/webfrontend/pgm2/01_FHEMWEB.pm @@ -835,6 +835,7 @@ FW_readgplotfile($$$) my (@filelog, @data, $plot); open(FH, $gplot_pgm) || return (FW_fatal("$gplot_pgm: $!"), undef); while(my $l = ) { + $l =~ s/\r//g; if($l =~ m/^#FileLog (.*)$/) { push(@filelog, $1); } elsif($l =~ "^plot" || $plot) { @@ -888,6 +889,9 @@ FW_substcfg($$$$$$) } } + $plot =~ s/\r//g; # For our windows friends... + $gplot_script =~ s/\r//g; + if($splitret == 1) { my @ret = split("\n", $gplot_script); return (\@ret, $plot);