improve timezone detection for caldav and remove smart birthday feature. Force adjust birthdays until we agree on how to deal with this.

2 files changed, 20 insertions, 12 deletions

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index 08d27c850..de639e281 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -1144,16 +1144,24 @@ class Cdav extends Controller {
 						$dtend = (string)$vevent->DTEND;
 						$description = (string)$vevent->DESCRIPTION;
 						$location = (string)$vevent->LOCATION;
-						$timezone = (string)$vevent->DTSTART['TZID'];
+						$timezone_str = (string)$vevent->DTSTART['TZID'];
 						$rw = ((cdav_perms($id[0],$calendars,true)) ? true : false);
 						$editable = $rw ? true : false;
 						$recurrent = ((isset($vevent->{'RECURRENCE-ID'})) ? true : false);
 
 						if($recurrent) {
 							$editable = false;
-							$timezone = $recurrent_timezone;
+							$timezone_str = $recurrent_timezone;
 						}
 
+						// Try to get an usable olson format timezone
+						$timezone_obj = \Sabre\VObject\TimeZoneUtil::getTimeZone($timezone_str, $vcalendar);
+						$timezone = $timezone_obj->getName();
+
+						// If we got nothing fallback to UTC
+						if(! $timezone)
+							$timezone = 'UTC';
+
 						$allDay = (((string)$vevent->DTSTART['VALUE'] == 'DATE') ? true : false);
 
 						$events[] = [
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 96d32039e..44fe261e8 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -345,8 +345,9 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 					if(! $tz)
 						$tz = 'UTC';
 
-					if($rr['etype'] === 'birthday')
-						$rr['adjust'] = intval(feature_enabled(local_channel(), 'smart_birthdays'));
+					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']){
@@ -356,7 +357,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 
 						// give a fake end to birthdays so they get crammed into a 
 						// single day on the calendar
-
 						if($rr['etype'] === 'birthday')
 							$end = null;
 					}
@@ -374,13 +374,13 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						}
 					}
 
-					$allDay = false;
+					//$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;
+					//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);
 	
@@ -395,10 +395,10 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						'start'=> $start,
 						'end' => $end,
 						'drop' => $drop,
-						'allDay' => $allDay,
+						'allDay' => (($rr['adjust']) ? 0 : 1),
 						'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8', false),
 						'editable' => $edit ? true : false,
-						'item'=>$rr,
+						'item' => $rr,
 						'plink' => [$rr['plink'], t('Link to source')],
 						'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8', false),
 						'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8', false),