From 0dc959d9fe40bddce5e99b8162bb0e770fc28ed9 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 24 Mar 2024 09:58:21 +0000 Subject: Deprecate *_config() functions in core. --- include/event.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/event.php') diff --git a/include/event.php b/include/event.php index 701f3c330..ef73fc9b5 100644 --- a/include/event.php +++ b/include/event.php @@ -8,6 +8,7 @@ use Sabre\VObject; use Zotlabs\Lib\Activity; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; use Zotlabs\Access\AccessList; @@ -237,7 +238,7 @@ function ical_wrapper($ev) { $o .= "BEGIN:VCALENDAR"; $o .= "\r\nVERSION:2.0"; $o .= "\r\nMETHOD:PUBLISH"; - $o .= "\r\nPRODID:-//" . get_config('system','sitename') . "//" . Zotlabs\Lib\System::get_platform_name() . "//" . strtoupper(App::$language). "\r\n"; + $o .= "\r\nPRODID:-//" . Config::Get('system','sitename') . "//" . Zotlabs\Lib\System::get_platform_name() . "//" . strtoupper(App::$language). "\r\n"; if(array_key_exists('dtstart', $ev)) $o .= format_event_ical($ev); else { -- cgit v1.2.3 From 494ff44a6984d2be3a40e276c728a33c124f5196 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 5 Jun 2024 10:04:16 +0000 Subject: adjusting to the wrong direction when exporting ical and do not use Z because timezone is attached --- include/event.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/event.php') diff --git a/include/event.php b/include/event.php index ef73fc9b5..3beb15b7a 100644 --- a/include/event.php +++ b/include/event.php @@ -272,9 +272,9 @@ function format_event_ical($ev) { if($ev['adjust']) { if($ev['dtstart']) - $o .= "\r\nDTSTART$tzid:" . datetime_convert($tz,'UTC', $ev['dtstart'],'Ymd\\THis\\Z'); + $o .= "\r\nDTSTART$tzid:" . datetime_convert('UTC', $tz, $ev['dtstart'],'Ymd\\THis'); if($ev['dtend'] && ! $ev['nofinish']) - $o .= "\r\nDTEND$tzid:" . datetime_convert($tz,'UTC', $ev['dtend'],'Ymd\\THis\\Z'); + $o .= "\r\nDTEND$tzid:" . datetime_convert('UTC', $tz, $ev['dtend'],'Ymd\\THis'); } else { if($ev['dtstart']) -- cgit v1.2.3 From 8f41d170a557dfd18caab7e7d8b2405b23b7b2e8 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Jun 2024 09:45:33 +0000 Subject: fix wrong variable --- include/event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/event.php') diff --git a/include/event.php b/include/event.php index 3beb15b7a..f8511cbe2 100644 --- a/include/event.php +++ b/include/event.php @@ -797,7 +797,7 @@ function parse_event_object($event_object_json) { $tz = $object['timezone'] ?? 'UTC'; $ev['summary'] = $object['summary'] ?? $object['name'] ?? ''; - $ev['description'] = html2bbcode($content['content']) ?? ''; + $ev['description'] = html2bbcode($object['content']) ?? ''; $ev['dtstart'] = $object['startTime'] ? datetime_convert('UTC', 'UTC', $object['startTime']) : ''; $ev['dtend'] = $object['endTime'] ? datetime_convert('UTC', 'UTC', $object['endTime']) : $ev['dtstart']; $ev['location'] = $object['location']['name'] ?? ''; -- cgit v1.2.3