harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust birthday handling according to community decision and slightly change display of allday event items

Browse Source
This commit is contained in:
Mario Vavti
2019-05-26 18:05:11 +02:00
parent 528b9b6a60
commit e466d72058
7 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Zotlabs/Module/Channel_calendar.php
View File

@@ -345,20 +345,11 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
if(! $tz)
$tz = 'UTC';
if($rr['etype'] === 'birthday') {
$rr['adjust'] = 1; //intval(feature_enabled(local_channel(), 'smart_birthdays'));
}
$start = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
if ($rr['nofinish']){
$end = null;
} else {
$end = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
// give a fake end to birthdays so they get crammed into a
// single day on the calendar
if($rr['etype'] === 'birthday')
$end = null;
}
$catsenabled = feature_enabled(local_channel(),'categories');
@@ -374,14 +365,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
}
}
//$allDay = false;
// allDay event rules
//if(!strpos($start, 'T') && !strpos($end, 'T'))
// $allDay = true;
//if(strpos($start, 'T00:00:00') && strpos($end, 'T00:00:00'))
// $allDay = true;
$edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false);
$drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');