X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=dav%2Fcommon%2Fcalendar_rendering.fnk.php;h=d80892f7ccac8d630a3c506945c2e3cddbe960f6;hb=6d88e63f60abff999fe5b99f43be581e9b0350a8;hp=b6c009dbb997ef7f167072455529316bd31c5180;hpb=64fa5eb924b7e0fe6021117addd2e0acbf3f79cd;p=friendica-addons.git

diff --git a/dav/common/calendar_rendering.fnk.php b/dav/common/calendar_rendering.fnk.php
index b6c009db..d80892f7 100644
--- a/dav/common/calendar_rendering.fnk.php
+++ b/dav/common/calendar_rendering.fnk.php
@@ -3,8 +3,8 @@
 
 
 /**
- * @param Sabre_VObject_Component_VAlarm $alarm
- * @param Sabre_VObject_Component_VEvent|Sabre_VObject_Component_VTodo $parent
+ * @param Sabre\VObject\Component\VAlarm $alarm
+ * @param Sabre\VObject\Component\VEvent|Sabre\VObject\Component\VTodo $parent
  * @return DateTime|null
  * @throws Sabre_DAV_Exception
  */
@@ -12,12 +12,12 @@ function renderCalDavEntry_calcalarm(&$alarm, &$parent)
 {
 	$trigger = $alarm->__get("TRIGGER");
 	if (!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
-		$triggerDuration = Sabre_VObject_DateTimeParser::parseDuration($trigger);
+		$triggerDuration = Sabre\VObject\DateTimeParser::parseDuration($trigger->value);
 
 		$related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
 
 		if ($related === 'START') {
-			/** @var Sabre_VObject_Property_DateTime $dtstart  */
+			/** @var Sabre\VObject\Property\DateTime $dtstart  */
 			$dtstart          = $parent->__get("DTSTART");
 			$effectiveTrigger = $dtstart->getDateTime();
 			$effectiveTrigger->add($triggerDuration);
@@ -28,14 +28,14 @@ function renderCalDavEntry_calcalarm(&$alarm, &$parent)
 				$endProp = 'DTEND';
 			}
 
-			/** @var Sabre_VObject_Property_DateTime $dtstart  */
+			/** @var Sabre\VObject\Property\DateTime $dtstart  */
 			$dtstart = $parent->__get("DTSTART");
 			if (isset($parent->$endProp)) {
 				$effectiveTrigger = clone $parent->$endProp->getDateTime();
 				$effectiveTrigger->add($triggerDuration);
 			} elseif ($parent->__get("DURATION") != "") {
 				$effectiveTrigger = clone $dtstart->getDateTime();
-				$duration         = Sabre_VObject_DateTimeParser::parseDuration($parent->__get("DURATION"));
+				$duration         = Sabre\VObject\DateTimeParser::parseDuration($parent->__get("DURATION"));
 				$effectiveTrigger->add($duration);
 				$effectiveTrigger->add($triggerDuration);
 			} else {
@@ -58,10 +58,10 @@ function renderCalDavEntry_calcalarm(&$alarm, &$parent)
  */
 function renderCalDavEntry_data(&$calendar, &$calendarobject)
 {
-	/** @var Sabre_VObject_Component_VCalendar $vObject  */
-	$vObject       = Sabre_VObject_Reader::read($calendarobject["calendardata"]);
+	/** @var Sabre\VObject\Component\VCalendar $vObject  */
+	$vObject       = Sabre\VObject\Reader::read($calendarobject["calendardata"]);
 	$componentType = null;
-	/** @var Sabre_VObject_Component_VEvent $component  */
+	/** @var Sabre\VObject\Component\VEvent $component  */
 	$component = null;
 	foreach ($vObject->getComponents() as $component) {
 		if ($component->name !== 'VTIMEZONE') {
@@ -73,6 +73,8 @@ function renderCalDavEntry_data(&$calendar, &$calendarobject)
 		throw new Sabre_DAV_Exception_BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
 	}
 
+	$timezoneOffset = date("P"); // @TODO Get the actual timezone from the event
+
 
 	if ($componentType !== 'VEVENT') return;
 
@@ -84,18 +86,18 @@ function renderCalDavEntry_data(&$calendar, &$calendarobject)
 	);
 
 	$recurring = ($component->__get("RRULE") ? 1 : 0);
-	/** @var Sabre_VObject_Property_DateTime $dtstart  */
+	/** @var Sabre\VObject\Property\DateTime $dtstart  */
 	$dtstart = $component->__get("DTSTART");
-	$allday  = ($dtstart->getDateType() == Sabre_VObject_Property_DateTime::DATE ? 1 : 0);
+	$allday  = ($dtstart->getDateType() == Sabre\VObject\Property\DateTime::DATE ? 1 : 0);
 
-	/** @var array|Sabre_VObject_Component_VAlarm[] $alarms  */
+	/** @var array|Sabre\VObject\Component\VAlarm[] $alarms  */
 	$alarms = array();
 	foreach ($component->getComponents() as $a_component) if ($a_component->name == "VALARM") {
-		/** var Sabre_VObject_Component_VAlarm $component */
+		/** var Sabre\VObject\Component\VAlarm $component */
 		$alarms[] = $a_component;
 	}
 
-	$it       = new Sabre_VObject_RecurrenceIterator($vObject, (string)$component->__get("UID"));
+	$it       = new Sabre\VObject\RecurrenceIterator($vObject, (string)$component->__get("UID"));
 	$last_end = 0;
 	$max_ts   = mktime(0, 0, 0, 1, 1, CALDAV_MAX_YEAR * 1);
 	$first    = true;
@@ -106,15 +108,15 @@ function renderCalDavEntry_data(&$calendar, &$calendarobject)
 		$start    = $it->getDtStart()->getTimestamp();
 
 		q("INSERT INTO %s%sjqcalendar (`calendar_id`, `calendarobject_id`, `Summary`, `StartTime`, `EndTime`, `IsEditable`, `IsAllDayEvent`, `IsRecurring`, `Color`) VALUES
-			(%d, %d, '%s', '%s', '%s', %d, %d, %d, '%s')", CALDAV_SQL_DB, CALDAV_SQL_PREFIX,
-			IntVal($calendar["id"]), IntVal($calendarobject["id"]), dbesc($event["summary"]), date("Y-m-d H:i:s", $start), date("Y-m-d H:i:s", $last_end),
-			1, $allday, $recurring, dbesc(substr($event["color"], 1))
+			(%d, %d, '%s', CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), %d, %d, %d, '%s')",
+			CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), dbesc($event["summary"]), date("Y-m-d H:i:s", $start),
+			date("Y-m-d H:i:s", $last_end), 1, $allday, $recurring, dbesc(substr($event["color"], 1))
 		);
 
 		foreach ($alarms as $alarm) {
 			$alarm    = renderCalDavEntry_calcalarm($alarm, $component);
 			$notified = ($alarm->getTimestamp() < time() ? 1 : 0);
-			q("INSERT INTO %s%snotifications (`calendar_id`, `calendarobject_id`, `alert_date`, `notified`) VALUES (%d, %d, '%s', %d)",
+			q("INSERT INTO %s%snotifications (`calendar_id`, `calendarobject_id`, `alert_date`, `notified`) VALUES (%d, %d, CONVERT_TZ('%s', '$timezoneOffset', @@session.time_zone), %d)",
 				CALDAV_SQL_DB, CALDAV_SQL_PREFIX, IntVal($calendar["id"]), IntVal($calendarobject["id"]), $alarm->format("Y-m-d H:i:s"), $notified
 			);
 		}