From 3e8ca40584e46293c0bba575a3a025cec8f1dc48 Mon Sep 17 00:00:00 2001
From: Beta-User <>
Date: Tue, 12 Nov 2019 18:30:13 +0000
Subject: [PATCH] 98_WeekdayTimer.pm: allow newline format in DEF

git-svn-id: https://svn.fhem.de/fhem/trunk@20501 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/98_WeekdayTimer.pm              | 7 ++++---
 fhem/FHEM/lib/AttrTemplate/mqtt2.template | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fhem/FHEM/98_WeekdayTimer.pm b/fhem/FHEM/98_WeekdayTimer.pm
index 86426ea82..2cdb59eb9 100644
--- a/fhem/FHEM/98_WeekdayTimer.pm
+++ b/fhem/FHEM/98_WeekdayTimer.pm
@@ -167,8 +167,9 @@ sub WeekdayTimer_Undef($$) {
 sub WeekdayTimer_Define($$) {
   my ($hash, $def) = @_;
   WeekdayTimer_InitHelper($hash);
-
-  my  @a = split("[ \t]+", $def);
+  #$def =~ s/[\s\\\n]+/ /gm;
+  #$def =~ s/^([^ ])/ $1/gm;
+  my  @a = split("[ \t\\\n]+", $def);
 
   return "Usage: define <name> $hash->{TYPE} <device> <language> <switching times> <condition|command>"
      if(@a < 4);
@@ -197,7 +198,7 @@ sub WeekdayTimer_Define($$) {
 sub WeekdayTimer_Start($) {
   my ($hash) = @_;
   my $name = $hash->{NAME};
-  my @a = split("[ \t]+", $hash->{DEF});
+  my @a = split("[ \t\\\n]+", $hash->{DEF});
   #my  @a = split("[ \t]+", $def);
  
   #my $type     = shift @a;
diff --git a/fhem/FHEM/lib/AttrTemplate/mqtt2.template b/fhem/FHEM/lib/AttrTemplate/mqtt2.template
index 47e797af5..92ba6f0f2 100644
--- a/fhem/FHEM/lib/AttrTemplate/mqtt2.template
+++ b/fhem/FHEM/lib/AttrTemplate/mqtt2.template
@@ -25,7 +25,7 @@ par:IODEVNAME;Name of the IO-Device; { AttrVal("DEVICE","IODev",undef) }
 par:DEVTYPE;TYPE of the device; { InternalVal("DEVICE","TYPE",undef)}
 par:DEVCID;CID of the device as written in the DEF; { InternalVal(AttrVal("DEVICE","IODev",""),"clientId","mosquitto") eq InternalVal("DEVICE","DEF","mosquitto") ? "MQTT2_GeneralBridge" : InternalVal("DEVICE","DEF","mosquitto")}
 par:NEWDEVROOM;Room of the calling device; {AttrVal("DEVCID","room","MQTT2_\DEVICE" )} 
-par:ICON;ICON as set, defaults to mqtt;{ AttrVal("DEVICE","icon","mqtt") }
+par:ICON;ICON as set, defaults to mqtt;{ AttrVal("DEVICE","icon","mqtt_bridge_2") }
 attr DEVICE icon ICON
 defmod DEVCID MQTT2_\DEVICE DEVCID
 attr DEVCID bridgeRegexp \