clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

events with no finish should not export it to ical

This commit is contained in:
Tobias Diekershoff 2016-08-20 16:16:19 +02:00
parent 9fa4a3bac6
commit f344813054
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/event.php
View File

@ -673,7 +673,7 @@ function event_format_export ($events, $format = 'ical', $timezone) {
$dtformat = "%Y%m%dT%H%M%S".$UTC; $dtformat = "%Y%m%dT%H%M%S".$UTC;
$o .= 'DTSTART:'.strftime($dtformat, $tmp).PHP_EOL; $o .= 'DTSTART:'.strftime($dtformat, $tmp).PHP_EOL;
} }
if ($event['finish']) { if (!$event['nofinish']) {
$tmp = strtotime($event['finish']); $tmp = strtotime($event['finish']);
$dtformat = "%Y%m%dT%H%M%S".$UTC; $dtformat = "%Y%m%dT%H%M%S".$UTC;
$o .= 'DTEND:'.strftime($dtformat, $tmp).PHP_EOL; $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 // requested? then show all of your events, otherwise only those that
// don't have limitations set in allow_cid and allow_gid // don't have limitations set in allow_cid and allow_gid
if (local_user() == $uid) { 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 ", FROM `event` WHERE `uid`= %d AND `cid` = 0 ",
intval($uid) intval($uid)
); );
} else { } else {
$r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`FROM `event` $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish`
WHERE `uid` = %d AND `cid` = 0 $sql_extra ", FROM `event` WHERE `uid`= %d AND `cid` = 0 $sql_extra ",
intval($uid) intval($uid)
); );
} }