FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-27 20:34:52 +00:00
Code Issues Releases Wiki Activity

fhemweb.js: URI-encode inform Parameter (Forum #128651)

Browse Source 
FileLog.pm: clarify filelog-event-min-interval doc


git-svn-id: https://svn.fhem.de/fhem/trunk@26329 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2022-08-17 07:57:51 +00:00
parent 32783cf141
commit d18a1055a9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/92_FileLog.pm
View File

@ -1570,6 +1570,8 @@ FileLog_regexpFn($$)
devspec:reading:minInterval triples. You may use regular expressions devspec:reading:minInterval triples. You may use regular expressions
for reading. The data will only be written, if at least minInterval for reading. The data will only be written, if at least minInterval
seconds elapsed since the last event of the matched type. seconds elapsed since the last event of the matched type.
Note: only readings existing at the time the attribute is set will be
considered.
</li><br> </li><br>
<li><a href="#ignoreRegexp">ignoreRegexp</a></li> <li><a href="#ignoreRegexp">ignoreRegexp</a></li>
@ -1898,6 +1900,8 @@ FileLog_regexpFn($$)
"devspec:readings:minInterval" Tripel. readings kann ein regexp sein. "devspec:readings:minInterval" Tripel. readings kann ein regexp sein.
Die Daten werden nur dann geschrieben, falls seit dem letzten Auftreten Die Daten werden nur dann geschrieben, falls seit dem letzten Auftreten
des gleichen Events mindestens minInterval Sekunden vergangen sind. des gleichen Events mindestens minInterval Sekunden vergangen sind.
Achtung: nur solche Readings werden geprueft, die zum Zeitpunkt des
Attribut setzens existiert haben.
</li><br> </li><br>
<li><a href="#ignoreRegexp">ignoreRegexp</a></li> <li><a href="#ignoreRegexp">ignoreRegexp</a></li>

4
fhem/www/pgm2/fhemweb.js
View File

@ -1321,8 +1321,10 @@ FW_longpoll()
if(FW_serverGenerated) if(FW_serverGenerated)
since = FW_serverLastMsg + (FW_serverGenerated-FW_serverFirstMsg); since = FW_serverLastMsg + (FW_serverGenerated-FW_serverFirstMsg);
let inform = encodeURIComponent("type=status;filter="+filter+
";since="+since+";fmt=JSON"); // 128651
var query = "?XHR=1"+ var query = "?XHR=1"+
"&inform=type=status;filter="+filter+";since="+since+";fmt=JSON"+ "&inform="+inform+
'&fw_id='+$("body").attr('fw_id')+ '&fw_id='+$("body").attr('fw_id')+
"&timestamp="+new Date().getTime(); "&timestamp="+new Date().getTime();