Explorar el Código

iCal Calendar fixes

Rob Gökemeijer hace 7 años
padre
commit
1246e6f30f
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      api/functions/homepage-connect-functions.php

+ 2 - 2
api/functions/homepage-connect-functions.php

@@ -986,10 +986,10 @@ function getCalendar()
 		foreach ($calendarURLList as $key => $value) {
 		foreach ($calendarURLList as $key => $value) {
 			$icsEvents = getIcsEventsAsArray($value);
 			$icsEvents = getIcsEventsAsArray($value);
 			if (isset($icsEvents) && !empty($icsEvents)) {
 			if (isset($icsEvents) && !empty($icsEvents)) {
-				$timeZone = trim($icsEvents [1] ['X-WR-TIMEZONE']);
+				$timeZone = isset($icsEvents [1] ['X-WR-TIMEZONE']) ? trim($icsEvents[1]['X-WR-TIMEZONE']) : date_default_timezone_get();
 				unset($icsEvents [1]);
 				unset($icsEvents [1]);
 				foreach ($icsEvents as $icsEvent) {
 				foreach ($icsEvents as $icsEvent) {
-					if (isset($icsEvent['DTSTART']) && isset($icsEvent['DTEND']) && isset($icsEvent['SUMMARY'])) {
+					if ((isset($icsEvent['DTSTART']) || isset($icsEvent['DTSTART;VALUE=DATE'])) && (isset($icsEvent['DTEND']) || isset($icsEvent['DTEND;VALUE=DATE'])) && isset($icsEvent['SUMMARY'])) {
 						/* Getting start date and time */
 						/* Getting start date and time */
 						$start = isset($icsEvent ['DTSTART;VALUE=DATE']) ? $icsEvent ['DTSTART;VALUE=DATE'] : $icsEvent ['DTSTART'];
 						$start = isset($icsEvent ['DTSTART;VALUE=DATE']) ? $icsEvent ['DTSTART;VALUE=DATE'] : $icsEvent ['DTSTART'];
 						/* Converting to datetime and apply the timezone to get proper date time */
 						/* Converting to datetime and apply the timezone to get proper date time */