From d18a1055a9a56881b71ed33bdb80e09e5e9f41ed Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Wed, 17 Aug 2022 07:57:51 +0000 Subject: [PATCH] fhemweb.js: URI-encode inform Parameter (Forum #128651) FileLog.pm: clarify filelog-event-min-interval doc git-svn-id: https://svn.fhem.de/fhem/trunk@26329 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/92_FileLog.pm | 4 ++++ fhem/www/pgm2/fhemweb.js | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index 499251253..488eddf91 100644 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -1570,6 +1570,8 @@ FileLog_regexpFn($$) devspec:reading:minInterval triples. You may use regular expressions for reading. The data will only be written, if at least minInterval seconds elapsed since the last event of the matched type. + Note: only readings existing at the time the attribute is set will be + considered.
  • ignoreRegexp
  • @@ -1898,6 +1900,8 @@ FileLog_regexpFn($$) "devspec:readings:minInterval" Tripel. readings kann ein regexp sein. Die Daten werden nur dann geschrieben, falls seit dem letzten Auftreten des gleichen Events mindestens minInterval Sekunden vergangen sind. + Achtung: nur solche Readings werden geprueft, die zum Zeitpunkt des + Attribut setzens existiert haben.
  • ignoreRegexp
  • diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js index f381a3a60..9fd7ecee5 100644 --- a/fhem/www/pgm2/fhemweb.js +++ b/fhem/www/pgm2/fhemweb.js @@ -1321,8 +1321,10 @@ FW_longpoll() if(FW_serverGenerated) since = FW_serverLastMsg + (FW_serverGenerated-FW_serverFirstMsg); + let inform = encodeURIComponent("type=status;filter="+filter+ + ";since="+since+";fmt=JSON"); // 128651 var query = "?XHR=1"+ - "&inform=type=status;filter="+filter+";since="+since+";fmt=JSON"+ + "&inform="+inform+ '&fw_id='+$("body").attr('fw_id')+ "×tamp="+new Date().getTime();