Fix MQTT topics

The MQTT Gateway doesn't support spaces in topic names.
In addition Date and Time values are not forwarded over MQTT
anymore as that can lead to problems as it can't be converted to
an analog input on loxone.

Author: Gagi2k

bin/wolf_ism8i.pl

@@ -212,7 +212,7 @@ ($)
     # Leerzeichen am Ende wird verworfen
     $working_string =~ s/\s+$//;
 
-    my @tbr = ("/", "_");
+    my @tbr = ("/", "_", ":", "", " ", "/");
 
     for (my $i=0; $i <= scalar(@tbr)-1; $i+=2)
     {
@@ -742,10 +742,11 @@ ($)
                              #if (scalar(@fields) == 6) { $topic .= "/".getMQTTFriendly($fields[5]); } # Einheit (wenn vorhanden)
 
                              my @types = ("DPT_Scaling","DPT_Value_Temp","DPT_Value_Tempd","DPT_Value_Pres",
-                                        "DPT_Power","DPT_Value_Volume_Flow","DPT_TimeOfDay",
-                                        "DPT_Date","DPT_FlowRate_m3/h","DPT_ActiveEnergy",
+                                        "DPT_Power","DPT_Value_Volume_Flow",
+                                        ,"DPT_FlowRate_m3/h","DPT_ActiveEnergy",
                                         "DPT_ActiveEnergy_kWh","DPT_Value_1_Ucount", "DPT_Value_2_Ucount" );
                              my @bool_types = ("DPT_Switch","DPT_Bool","DPT_Enable","DPT_OpenClose");
+                             my @ignored_types = ("DPT_TimeOfDay","DPT_Date");
                              my $datatype = getDatenpunkt($DP_ID, 3);
                              my $value;
                              if (grep( /^$datatype$/, @types )) {
@@ -756,6 +757,8 @@ ($)
                                 } else {
                                     $value = "false";
                                 }
+                             } elsif (grep( /^$datatype$/, @ignored_types )) {
+                                goto err;
                              } else {
                                 $value = $DP_value;
                              }

webfrontend/htmlauth/index.cgi

@@ -213,7 +213,8 @@ if ($R::saveformdata2) {
 
         my $linenr = $VIhttp->VirtualInHttpCmd (
             Title => "wolfism8_online",
-            Comment => "ISM8 Online State"
+            Comment => "ISM8 Online State",
+            Check => " "
         );
 
         my $count = scalar(@datenpunkte);
@@ -223,14 +224,20 @@ if ($R::saveformdata2) {
             my $id = sprintf "%03d", $datenpunkte[$i][0];
             my $device = $datenpunkte[$i][1];
             my $name = encode('UTF-8', $datenpunkte[$i][1]." ".$datenpunkte[$i][2]);
-            my $topic = encode('UTF-8', "wolfism8_".getMQTTFriendly($datenpunkte[$i][1])."_".getMQTTFriendly($datenpunkte[$i][2]));
+            my $topic = encode('UTF-8', "wolfism8/".getMQTTFriendly($datenpunkte[$i][1])."/".getMQTTFriendly($datenpunkte[$i][2]));
+            $topic =~ s/\//_/g;
             my $input_output = $datenpunkte[$i][4];
             if ($id == '000') {
                 next;
             }
             if (!($input_output =~ /Out/)) {
                 next;
             }
+            my $datatype = $datenpunkte[$i][3];
+            my @date_types = ("DPT_TimeOfDay","DPT_Date");
+            if (grep( /^$datatype$/, @date_types )) {
+                next;
+            }
 
             foreach $item (@devices) {
                 if ($item eq $device) {
@@ -490,7 +497,7 @@ sub getMQTTFriendly($)
     # Leerzeichen am Ende wird verworfen
     $working_string =~ s/\s+$//;
 
-    my @tbr = ("/", "_");
+    my @tbr = ("/", "_", ":", "", " ", "/");
 
     for (my $i=0; $i <= scalar(@tbr)-1; $i+=2)
     {