FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 12:58:13 +00:00
Code Issues Releases Wiki Activity

57_Calendar: fix for Perl warning on undefined $t when download of ical has failed; added note on Nextcloud calendar

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17531 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2018-10-14 16:19:52 +00:00
parent fa3ad697c4
commit f2fb24ecbc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/57_Calendar.pm
View File

@ -2564,13 +2564,13 @@ sub Calendar_ProcessUpdate($$$) {
}
}
$hash->{".fhem"}{t}= $t;
if($errmsg or !defined($ics) or ("$ics" eq "") ) {
Log3 $hash, 1, "Calendar $name: retrieved no or empty data";
readingsSingleUpdate($hash, "state", "error (no or empty data)", 1);
Calendar_CheckAndRearm($hash);
} else {
$hash->{".fhem"}{iCalendar}= $ics; # the plain text iCalendar
$hash->{".fhem"}{t}= $t;
$hash->{".fhem"}{removeall}= $removeall;
if(AttrVal($name, "update", "sync") eq "async") {
Calendar_AsynchronousUpdateCalendar($hash);
@ -3192,6 +3192,10 @@ sub CalendarEventsAsHtml($;$) {
replace it by <code>http://</code> if and only if there is no redirection to the <code>https://</code> URL.
Check with your browser first if unsure.<br><br>
Note for users of Netxtcloud Calendar: you can use an URL of the form
<code>https://admin:admin@demo.nextcloud.com/wid0ohgh/remote.php/dav/calendars/admin/personal/?export</code>.
<p>
The optional parameter <code>interval</code> is the time between subsequent updates
in seconds. It defaults to 3600 (1 hour).<br><br>
@ -3829,6 +3833,11 @@ sub CalendarEventsAsHtml($;$) {
kannst Du in der URL <code>https://</code> durch <code>http://</code> ersetzen, falls keine automatische Umleitung auf die <code>https://</code> URL erfolgt.
Solltest Du unsicher sein, ob dies der Fall ist, &uuml;berpr&uuml;fe es bitte zuerst mit Deinem Browser.<br><br>
Hinweis f&uuml;r Nutzer des Nextcloud-Kalenders: Du kannst eine URL der folgenden Form benutzen:
<code>https://admin:admin@demo.nextcloud.com/wid0ohgh/remote.php/dav/calendars/admin/personal/?export</code>.<p>
Der optionale Parameter <code>interval</code> bestimmt die Zeit in Sekunden zwischen den Updates. Default-Wert ist 3600 (1 Stunde).<br><br>
Beispiele: