nextcloud / server

apps/dav/lib/CalDAV/Reminder/NotificationProvider/AudioProvider.php

Indentation +2 added lines, -2 removed lines

@@ -32,6 +32,6 @@
  */
 class AudioProvider extends PushProvider {
 
-	/** @var string */
-	public const NOTIFICATION_TYPE = 'AUDIO';
+    /** @var string */
+    public const NOTIFICATION_TYPE = 'AUDIO';
 }

apps/dav/lib/CalDAV/Reminder/Backend.php

Indentation +181 added lines, -181 removed lines

@@ -35,185 +35,185 @@
  */
 class Backend {
 
-	/** @var IDBConnection */
-	protected $db;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * Backend constructor.
-	 *
-	 * @param IDBConnection $db
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $db,
-								ITimeFactory $timeFactory) {
-		$this->db = $db;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * Get all reminders with a notification date before now
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getRemindersToProcess():array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['cr.*', 'co.calendardata', 'c.displayname', 'c.principaluri'])
-			->from('calendar_reminders', 'cr')
-			->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime())))
-			->leftJoin('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id'))
-			->leftJoin('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'));
-		$stmt = $query->execute();
-
-		return array_map(
-			[$this, 'fixRowTyping'],
-			$stmt->fetchAll()
-		);
-	}
-
-	/**
-	 * Get all scheduled reminders for an event
-	 *
-	 * @param int $objectId
-	 * @return array
-	 */
-	public function getAllScheduledRemindersForEvent(int $objectId):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('calendar_reminders')
-			->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
-		$stmt = $query->execute();
-
-		return array_map(
-			[$this, 'fixRowTyping'],
-			$stmt->fetchAll()
-		);
-	}
-
-	/**
-	 * Insert a new reminder into the database
-	 *
-	 * @param int $calendarId
-	 * @param int $objectId
-	 * @param string $uid
-	 * @param bool $isRecurring
-	 * @param int $recurrenceId
-	 * @param bool $isRecurrenceException
-	 * @param string $eventHash
-	 * @param string $alarmHash
-	 * @param string $type
-	 * @param bool $isRelative
-	 * @param int $notificationDate
-	 * @param bool $isRepeatBased
-	 * @return int The insert id
-	 */
-	public function insertReminder(int $calendarId,
-								   int $objectId,
-								   string $uid,
-								   bool $isRecurring,
-								   int $recurrenceId,
-								   bool $isRecurrenceException,
-								   string $eventHash,
-								   string $alarmHash,
-								   string $type,
-								   bool $isRelative,
-								   int $notificationDate,
-								   bool $isRepeatBased):int {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendar_reminders')
-			->values([
-				'calendar_id' => $query->createNamedParameter($calendarId),
-				'object_id' => $query->createNamedParameter($objectId),
-				'uid' => $query->createNamedParameter($uid),
-				'is_recurring' => $query->createNamedParameter($isRecurring ? 1 : 0),
-				'recurrence_id' => $query->createNamedParameter($recurrenceId),
-				'is_recurrence_exception' => $query->createNamedParameter($isRecurrenceException ? 1 : 0),
-				'event_hash' => $query->createNamedParameter($eventHash),
-				'alarm_hash' => $query->createNamedParameter($alarmHash),
-				'type' => $query->createNamedParameter($type),
-				'is_relative' => $query->createNamedParameter($isRelative ? 1 : 0),
-				'notification_date' => $query->createNamedParameter($notificationDate),
-				'is_repeat_based' => $query->createNamedParameter($isRepeatBased ? 1 : 0),
-			])
-			->execute();
-
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * Sets a new notificationDate on an existing reminder
-	 *
-	 * @param int $reminderId
-	 * @param int $newNotificationDate
-	 */
-	public function updateReminder(int $reminderId,
-								   int $newNotificationDate):void {
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendar_reminders')
-			->set('notification_date', $query->createNamedParameter($newNotificationDate))
-			->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
-			->execute();
-	}
-
-	/**
-	 * Remove a reminder by it's id
-	 *
-	 * @param integer $reminderId
-	 * @return void
-	 */
-	public function removeReminder(int $reminderId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
-			->execute();
-	}
-
-	/**
-	 * Cleans reminders in database
-	 *
-	 * @param int $objectId
-	 */
-	public function cleanRemindersForEvent(int $objectId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
-			->execute();
-	}
-
-	/**
-	 * Remove all reminders for a calendar
-	 *
-	 * @param int $calendarId
-	 * @return void
-	 */
-	public function cleanRemindersForCalendar(int $calendarId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('calendar_id', $query->createNamedParameter($calendarId)))
-			->execute();
-	}
-
-	/**
-	 * @param array $row
-	 * @return array
-	 */
-	private function fixRowTyping(array $row): array {
-		$row['id'] = (int) $row['id'];
-		$row['calendar_id'] = (int) $row['calendar_id'];
-		$row['object_id'] = (int) $row['object_id'];
-		$row['is_recurring'] = (bool) $row['is_recurring'];
-		$row['recurrence_id'] = (int) $row['recurrence_id'];
-		$row['is_recurrence_exception'] = (bool) $row['is_recurrence_exception'];
-		$row['is_relative'] = (bool) $row['is_relative'];
-		$row['notification_date'] = (int) $row['notification_date'];
-		$row['is_repeat_based'] = (bool) $row['is_repeat_based'];
-
-		return $row;
-	}
+    /** @var IDBConnection */
+    protected $db;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * Backend constructor.
+     *
+     * @param IDBConnection $db
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $db,
+                                ITimeFactory $timeFactory) {
+        $this->db = $db;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * Get all reminders with a notification date before now
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function getRemindersToProcess():array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['cr.*', 'co.calendardata', 'c.displayname', 'c.principaluri'])
+            ->from('calendar_reminders', 'cr')
+            ->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime())))
+            ->leftJoin('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id'))
+            ->leftJoin('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'));
+        $stmt = $query->execute();
+
+        return array_map(
+            [$this, 'fixRowTyping'],
+            $stmt->fetchAll()
+        );
+    }
+
+    /**
+     * Get all scheduled reminders for an event
+     *
+     * @param int $objectId
+     * @return array
+     */
+    public function getAllScheduledRemindersForEvent(int $objectId):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('calendar_reminders')
+            ->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
+        $stmt = $query->execute();
+
+        return array_map(
+            [$this, 'fixRowTyping'],
+            $stmt->fetchAll()
+        );
+    }
+
+    /**
+     * Insert a new reminder into the database
+     *
+     * @param int $calendarId
+     * @param int $objectId
+     * @param string $uid
+     * @param bool $isRecurring
+     * @param int $recurrenceId
+     * @param bool $isRecurrenceException
+     * @param string $eventHash
+     * @param string $alarmHash
+     * @param string $type
+     * @param bool $isRelative
+     * @param int $notificationDate
+     * @param bool $isRepeatBased
+     * @return int The insert id
+     */
+    public function insertReminder(int $calendarId,
+                                    int $objectId,
+                                    string $uid,
+                                    bool $isRecurring,
+                                    int $recurrenceId,
+                                    bool $isRecurrenceException,
+                                    string $eventHash,
+                                    string $alarmHash,
+                                    string $type,
+                                    bool $isRelative,
+                                    int $notificationDate,
+                                    bool $isRepeatBased):int {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendar_reminders')
+            ->values([
+                'calendar_id' => $query->createNamedParameter($calendarId),
+                'object_id' => $query->createNamedParameter($objectId),
+                'uid' => $query->createNamedParameter($uid),
+                'is_recurring' => $query->createNamedParameter($isRecurring ? 1 : 0),
+                'recurrence_id' => $query->createNamedParameter($recurrenceId),
+                'is_recurrence_exception' => $query->createNamedParameter($isRecurrenceException ? 1 : 0),
+                'event_hash' => $query->createNamedParameter($eventHash),
+                'alarm_hash' => $query->createNamedParameter($alarmHash),
+                'type' => $query->createNamedParameter($type),
+                'is_relative' => $query->createNamedParameter($isRelative ? 1 : 0),
+                'notification_date' => $query->createNamedParameter($notificationDate),
+                'is_repeat_based' => $query->createNamedParameter($isRepeatBased ? 1 : 0),
+            ])
+            ->execute();
+
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * Sets a new notificationDate on an existing reminder
+     *
+     * @param int $reminderId
+     * @param int $newNotificationDate
+     */
+    public function updateReminder(int $reminderId,
+                                    int $newNotificationDate):void {
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendar_reminders')
+            ->set('notification_date', $query->createNamedParameter($newNotificationDate))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
+            ->execute();
+    }
+
+    /**
+     * Remove a reminder by it's id
+     *
+     * @param integer $reminderId
+     * @return void
+     */
+    public function removeReminder(int $reminderId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
+            ->execute();
+    }
+
+    /**
+     * Cleans reminders in database
+     *
+     * @param int $objectId
+     */
+    public function cleanRemindersForEvent(int $objectId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
+            ->execute();
+    }
+
+    /**
+     * Remove all reminders for a calendar
+     *
+     * @param int $calendarId
+     * @return void
+     */
+    public function cleanRemindersForCalendar(int $calendarId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('calendar_id', $query->createNamedParameter($calendarId)))
+            ->execute();
+    }
+
+    /**
+     * @param array $row
+     * @return array
+     */
+    private function fixRowTyping(array $row): array {
+        $row['id'] = (int) $row['id'];
+        $row['calendar_id'] = (int) $row['calendar_id'];
+        $row['object_id'] = (int) $row['object_id'];
+        $row['is_recurring'] = (bool) $row['is_recurring'];
+        $row['recurrence_id'] = (int) $row['recurrence_id'];
+        $row['is_recurrence_exception'] = (bool) $row['is_recurrence_exception'];
+        $row['is_relative'] = (bool) $row['is_relative'];
+        $row['notification_date'] = (int) $row['notification_date'];
+        $row['is_repeat_based'] = (bool) $row['is_repeat_based'];
+
+        return $row;
+    }
 }

apps/dav/appinfo/app.php

Indentation +49 added lines, -49 removed lines

@@ -33,59 +33,59 @@ 
 $app->registerHooks();
 
 \OC::$server->registerService('CardDAVSyncService', function() use ($app) {
-	return $app->getSyncService();
+    return $app->getSyncService();
 });
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 
 $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-	function(GenericEvent $event) use ($app) {
-		/** @var CardDavBackend $cardDavBackend */
-		$cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
-		$addressBookUri = $event->getSubject();
-		$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-		if (!is_null($addressBook)) {
-			$cardDavBackend->deleteAddressBook($addressBook['id']);
-		}
-	}
+    function(GenericEvent $event) use ($app) {
+        /** @var CardDavBackend $cardDavBackend */
+        $cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
+        $addressBookUri = $event->getSubject();
+        $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+        if (!is_null($addressBook)) {
+            $cardDavBackend->deleteAddressBook($addressBook['id']);
+        }
+    }
 );
 
 $eventDispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-	function(GenericEvent $event) use ($app) {
-		$jobList = $app->getContainer()->getServer()->getJobList();
-		$subscriptionData = $event->getArgument('subscriptionData');
-
-		$jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-			'principaluri' => $subscriptionData['principaluri'],
-			'uri' => $subscriptionData['uri']
-		]);
-	}
+    function(GenericEvent $event) use ($app) {
+        $jobList = $app->getContainer()->getServer()->getJobList();
+        $subscriptionData = $event->getArgument('subscriptionData');
+
+        $jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+            'principaluri' => $subscriptionData['principaluri'],
+            'uri' => $subscriptionData['uri']
+        ]);
+    }
 );
 
 $eventDispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-	function(GenericEvent $event) use ($app) {
-		$jobList = $app->getContainer()->getServer()->getJobList();
-		$subscriptionData = $event->getArgument('subscriptionData');
-
-		$jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-			'principaluri' => $subscriptionData['principaluri'],
-			'uri' => $subscriptionData['uri']
-		]);
-
-		/** @var \OCA\DAV\CalDAV\CalDavBackend $calDavBackend */
-		$calDavBackend = $app->getContainer()->query(\OCA\DAV\CalDAV\CalDavBackend::class);
-		$calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
-	}
+    function(GenericEvent $event) use ($app) {
+        $jobList = $app->getContainer()->getServer()->getJobList();
+        $subscriptionData = $event->getArgument('subscriptionData');
+
+        $jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+            'principaluri' => $subscriptionData['principaluri'],
+            'uri' => $subscriptionData['uri']
+        ]);
+
+        /** @var \OCA\DAV\CalDAV\CalDavBackend $calDavBackend */
+        $calDavBackend = $app->getContainer()->query(\OCA\DAV\CalDAV\CalDavBackend::class);
+        $calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
+    }
 );
 
 $eventHandler = function() use ($app) {
-	try {
-		$job = $app->getContainer()->query(\OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob::class);
-		$job->run([]);
-		$app->getContainer()->getServer()->getJobList()->setLastRun($job);
-	} catch(\Exception $ex) {
-		$app->getContainer()->getServer()->getLogger()->logException($ex);
-	}
+    try {
+        $job = $app->getContainer()->query(\OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob::class);
+        $job->run([]);
+        $app->getContainer()->getServer()->getJobList()->setLastRun($job);
+    } catch(\Exception $ex) {
+        $app->getContainer()->getServer()->getLogger()->logException($ex);
+    }
 };
 
 $eventDispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
@@ -93,20 +93,20 @@ 
 
 $cm = \OC::$server->getContactsManager();
 $cm->register(function() use ($cm, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if (!is_null($user)) {
-		$app->setupContactsProvider($cm, $user->getUID());
-	} else {
-		$app->setupSystemContactsProvider($cm);
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if (!is_null($user)) {
+        $app->setupContactsProvider($cm, $user->getUID());
+    } else {
+        $app->setupSystemContactsProvider($cm);
+    }
 });
 
 $calendarManager = \OC::$server->getCalendarManager();
 $calendarManager->register(function() use ($calendarManager, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if ($user !== null) {
-		$app->setupCalendarProvider($calendarManager, $user->getUID());
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if ($user !== null) {
+        $app->setupCalendarProvider($calendarManager, $user->getUID());
+    }
 });
 
 $app->registerNotifier();