diff --git a/fhem/FHEM/98_weblink.pm b/fhem/FHEM/98_weblink.pm
index f1f47bc1f..a8ab1b9e8 100755
--- a/fhem/FHEM/98_weblink.pm
+++ b/fhem/FHEM/98_weblink.pm
@@ -210,7 +210,7 @@ wl_txt($$$$)
{
my ($v,$t,$c,$sz) = @_;
$c = "" if(!defined($c));
- $c =~ s/"//g;
+ $c =~ s/"/\"/g;
return "$t ";
}
@@ -220,6 +220,7 @@ wl_sel($$$@)
{
my ($v,$l,$c,$fnData) = @_;
my @al = split(",",$l);
+ $c =~ s/\\x3a/:/g if($c);
return FW_select($v,$v,\@al,$c, "set", $fnData);
}
@@ -241,7 +242,6 @@ wl_getRegFromFile($)
while($data = <$fh>) {
my @cols = split(" ", $data);
$maxcols = @cols if(@cols > $maxcols);
- $cols[2] =~ s/:/./g;
my $key = "$cols[1].$cols[2]";
$h{$key} = $data;
}
@@ -275,7 +275,9 @@ wl_PEdit($$$$)
$ret .= "";
$ret .= "
";
$ret .= "| Y-Axis label | ";
+ $conf{ylabel} =~ s/"//g if($conf{ylabel});
$ret .= "".wl_txt("ylabel", "left", $conf{ylabel}, 16)." | ";
+ $conf{y2label} =~ s/"//g if($conf{y2label});
$ret .= "".wl_txt("y2label","right", $conf{y2label}, 16)." | ";
$ret .= "
";
$ret .= "";
@@ -336,7 +338,7 @@ wl_PEdit($$$$)
$ret .= "
";
}
$ret .= "";
- $ret .= "Example lines for each regexp: $coldata |
";
+ $ret .= "Example lines for input:
$coldata";
$ret .= "| ";
$ret .= FW_submit("submit", "Write .gplot file")." |
";
@@ -382,8 +384,10 @@ weblink_WriteGplot($)
my @plot;
for(my $i=0; $i <= 8; $i++) {
next if(!$FW_webArgs{"title_$i"});
- print FH "#FileLog ". $FW_webArgs{"cl_$i"} .":".
- $FW_webArgs{"re_$i"} .":".
+ my $re = $FW_webArgs{"re_$i"};
+ $re = "" if(!defined($re));
+ $re =~ s/:/\\x3a/g;
+ print FH "#FileLog ". $FW_webArgs{"cl_$i"} .":$re:".
$FW_webArgs{"df_$i"} .":".
$FW_webArgs{"fn_$i"} ."\n";
push @plot, "\"\" using 1:2 axes ".