From f344813054884f32fe2dad838f3ca4b976c0d31f Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 20 Aug 2016 16:16:19 +0200 Subject: [PATCH] events with no finish should not export it to ical --- include/event.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/event.php b/include/event.php index 7b77ee8d61..98307e23e1 100644 --- a/include/event.php +++ b/include/event.php @@ -673,7 +673,7 @@ function event_format_export ($events, $format = 'ical', $timezone) { $dtformat = "%Y%m%dT%H%M%S".$UTC; $o .= 'DTSTART:'.strftime($dtformat, $tmp).PHP_EOL; } - if ($event['finish']) { + if (!$event['nofinish']) { $tmp = strtotime($event['finish']); $dtformat = "%Y%m%dT%H%M%S".$UTC; $o .= 'DTEND:'.strftime($dtformat, $tmp).PHP_EOL; @@ -732,13 +732,13 @@ function events_by_uid($uid = 0, $sql_extra = '') { // requested? then show all of your events, otherwise only those that // don't have limitations set in allow_cid and allow_gid if (local_user() == $uid) { - $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location` + $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish` FROM `event` WHERE `uid`= %d AND `cid` = 0 ", intval($uid) ); } else { - $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`FROM `event` - WHERE `uid` = %d AND `cid` = 0 $sql_extra ", + $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish` + FROM `event` WHERE `uid`= %d AND `cid` = 0 $sql_extra ", intval($uid) ); }