Loading Dockerfile +1 −1 Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" RUN sed -i 's/23,0,9,1/23,0,9,23/' ${BASE_DIR}/version.php RUN sed -i 's/23,0,9,1/23,0,9,24/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images Loading patches/022-multiplenotification.patch +62 −2 Original line number Diff line number Diff line Loading @@ -442,8 +442,67 @@ \ No newline at end of file --- ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider-new.php 2022-11-08 13:41:39.450075100 +0530 @@ -189,4 +189,4 @@ +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider-new.php 2022-11-09 12:25:04.761749300 +0530 @@ -10,6 +10,7 @@ * @author Georg Ehrke <oc.list@georgehrke.com> * @author Joas Schilling <coding@schilljs.com> * @author Roeland Jago Douma <roeland@famdouma.nl> + * @author Richard Steinmetz <richard@steinmetz.cloud> * * @license GNU AGPL version 3 or any later version * @@ -32,10 +33,10 @@ use OCA\DAV\CalDAV\Reminder\INotificationProvider; use OCP\IConfig; use OCP\IL10N; -use OCP\ILogger; use OCP\IURLGenerator; use OCP\IUser; use OCP\L10N\IFactory as L10NFactory; +use Psr\Log\LoggerInterface; use Sabre\VObject\Component\VEvent; use Sabre\VObject\DateTimeParser; use Sabre\VObject\Property; @@ -50,8 +51,7 @@ /** @var string */ public const NOTIFICATION_TYPE = ''; - /** @var ILogger */ - protected $logger; + protected LoggerInterface $logger; /** @var L10NFactory */ protected $l10nFactory; @@ -68,13 +68,7 @@ /** @var IConfig */ protected $config; - /** - * @param ILogger $logger - * @param L10NFactory $l10nFactory - * @param IConfig $config - * @param IUrlGenerator $urlGenerator - */ - public function __construct(ILogger $logger, + public function __construct(LoggerInterface $logger, L10NFactory $l10nFactory, IURLGenerator $urlGenerator, IConfig $config) { @@ -89,11 +83,13 @@ * * @param VEvent $vevent * @param string $calendarDisplayName + * @param string[] $principalEmailAddresses * @param IUser[] $users * @return void */ abstract public function send(VEvent $vevent, string $calendarDisplayName, + array $principalEmailAddresses, array $users = []): void; /** @@ -189,4 +185,4 @@ return clone $vevent->DTSTART; } Loading @@ -451,6 +510,7 @@ +} \ No newline at end of file --- ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider-new.php 2022-11-08 13:43:04.470075100 +0530 @@ -34,11 +34,12 @@ Loading Loading
Dockerfile +1 −1 Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" RUN sed -i 's/23,0,9,1/23,0,9,23/' ${BASE_DIR}/version.php RUN sed -i 's/23,0,9,1/23,0,9,24/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images Loading
patches/022-multiplenotification.patch +62 −2 Original line number Diff line number Diff line Loading @@ -442,8 +442,67 @@ \ No newline at end of file --- ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider-new.php 2022-11-08 13:41:39.450075100 +0530 @@ -189,4 +189,4 @@ +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider-new.php 2022-11-09 12:25:04.761749300 +0530 @@ -10,6 +10,7 @@ * @author Georg Ehrke <oc.list@georgehrke.com> * @author Joas Schilling <coding@schilljs.com> * @author Roeland Jago Douma <roeland@famdouma.nl> + * @author Richard Steinmetz <richard@steinmetz.cloud> * * @license GNU AGPL version 3 or any later version * @@ -32,10 +33,10 @@ use OCA\DAV\CalDAV\Reminder\INotificationProvider; use OCP\IConfig; use OCP\IL10N; -use OCP\ILogger; use OCP\IURLGenerator; use OCP\IUser; use OCP\L10N\IFactory as L10NFactory; +use Psr\Log\LoggerInterface; use Sabre\VObject\Component\VEvent; use Sabre\VObject\DateTimeParser; use Sabre\VObject\Property; @@ -50,8 +51,7 @@ /** @var string */ public const NOTIFICATION_TYPE = ''; - /** @var ILogger */ - protected $logger; + protected LoggerInterface $logger; /** @var L10NFactory */ protected $l10nFactory; @@ -68,13 +68,7 @@ /** @var IConfig */ protected $config; - /** - * @param ILogger $logger - * @param L10NFactory $l10nFactory - * @param IConfig $config - * @param IUrlGenerator $urlGenerator - */ - public function __construct(ILogger $logger, + public function __construct(LoggerInterface $logger, L10NFactory $l10nFactory, IURLGenerator $urlGenerator, IConfig $config) { @@ -89,11 +83,13 @@ * * @param VEvent $vevent * @param string $calendarDisplayName + * @param string[] $principalEmailAddresses * @param IUser[] $users * @return void */ abstract public function send(VEvent $vevent, string $calendarDisplayName, + array $principalEmailAddresses, array $users = []): void; /** @@ -189,4 +185,4 @@ return clone $vevent->DTSTART; } Loading @@ -451,6 +510,7 @@ +} \ No newline at end of file --- ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider-new.php 2022-11-08 13:43:04.470075100 +0530 @@ -34,11 +34,12 @@ Loading