nextcloud / server

lib/public/AppFramework/Bootstrap/IBootContext.php

Indentation +37 added lines, -37 removed lines

@@ -35,43 +35,43 @@
  */
 interface IBootContext {
 
-	/**
-	 * Get hold of the app's container
-	 *
-	 * Useful to register and query app-specific services
-	 *
-	 * @return IAppContainer
-	 * @since 20.0.0
-	 */
-	public function getAppContainer(): IAppContainer;
+    /**
+     * Get hold of the app's container
+     *
+     * Useful to register and query app-specific services
+     *
+     * @return IAppContainer
+     * @since 20.0.0
+     */
+    public function getAppContainer(): IAppContainer;
 
-	/**
-	 * Get hold of the server DI container
-	 *
-	 * Useful to register and query system-wide services
-	 *
-	 * @return IServerContainer
-	 * @since 20.0.0
-	 */
-	public function getServerContainer(): IServerContainer;
+    /**
+     * Get hold of the server DI container
+     *
+     * Useful to register and query system-wide services
+     *
+     * @return IServerContainer
+     * @since 20.0.0
+     */
+    public function getServerContainer(): IServerContainer;
 
-	/**
-	 * Invoke the given callable and inject all parameters based on their types
-	 * and names
-	 *
-	 * Note: when used with methods, make sure they are public or use \Closure::fromCallable
-	 * to wrap the private method call, e.g.
-	 *  * `$context->injectFn([$obj, 'publicMethod'])`
-	 *  * `$context->injectFn([$this, 'publicMethod'])`
-	 *  * `$context->injectFn(\Closure::fromCallable([$this, 'privateMethod']))`
-	 *
-	 * Note: the app container will be queried
-	 *
-	 * @param callable $fn
-	 * @throws QueryException if at least one of the parameter can't be resolved
-	 * @throws Throwable any error the function invocation might cause
-	 * @return mixed|null the return value of the invoked function, if any
-	 * @since 20.0.0
-	 */
-	public function injectFn(callable $fn);
+    /**
+     * Invoke the given callable and inject all parameters based on their types
+     * and names
+     *
+     * Note: when used with methods, make sure they are public or use \Closure::fromCallable
+     * to wrap the private method call, e.g.
+     *  * `$context->injectFn([$obj, 'publicMethod'])`
+     *  * `$context->injectFn([$this, 'publicMethod'])`
+     *  * `$context->injectFn(\Closure::fromCallable([$this, 'privateMethod']))`
+     *
+     * Note: the app container will be queried
+     *
+     * @param callable $fn
+     * @throws QueryException if at least one of the parameter can't be resolved
+     * @throws Throwable any error the function invocation might cause
+     * @return mixed|null the return value of the invoked function, if any
+     * @since 20.0.0
+     */
+    public function injectFn(callable $fn);
 }

lib/private/AppFramework/Bootstrap/FunctionInjector.php

Indentation +29 added lines, -29 removed lines

@@ -34,36 +34,36 @@
 
 class FunctionInjector {
 
-	/** @var IContainer */
-	private $container;
+    /** @var IContainer */
+    private $container;
 
-	public function __construct(IContainer $container) {
-		$this->container = $container;
-	}
+    public function __construct(IContainer $container) {
+        $this->container = $container;
+    }
 
-	public function injectFn(callable $fn) {
-		$reflected = new ReflectionFunction(Closure::fromCallable($fn));
-		return $fn(...array_map(function (ReflectionParameter $param) {
-			// First we try by type (more likely these days)
-			if (($type = $param->getType()) !== null) {
-				try {
-					return $this->container->query($type->getName());
-				} catch (QueryException $ex) {
-					// Ignore and try name as well
-				}
-			}
-			// Second we try by name (mostly for primitives)
-			try {
-				return $this->container->query($param->getName());
-			} catch (QueryException $ex) {
-				// As a last resort we pass `null` if allowed
-				if ($type !== null && $type->allowsNull()) {
-					return null;
-				}
+    public function injectFn(callable $fn) {
+        $reflected = new ReflectionFunction(Closure::fromCallable($fn));
+        return $fn(...array_map(function (ReflectionParameter $param) {
+            // First we try by type (more likely these days)
+            if (($type = $param->getType()) !== null) {
+                try {
+                    return $this->container->query($type->getName());
+                } catch (QueryException $ex) {
+                    // Ignore and try name as well
+                }
+            }
+            // Second we try by name (mostly for primitives)
+            try {
+                return $this->container->query($param->getName());
+            } catch (QueryException $ex) {
+                // As a last resort we pass `null` if allowed
+                if ($type !== null && $type->allowsNull()) {
+                    return null;
+                }
 
-				// Nothing worked, time to bail out
-				throw $ex;
-			}
-		}, $reflected->getParameters()));
-	}
+                // Nothing worked, time to bail out
+                throw $ex;
+            }
+        }, $reflected->getParameters()));
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 
 	public function injectFn(callable $fn) {
 		$reflected = new ReflectionFunction(Closure::fromCallable($fn));
-		return $fn(...array_map(function (ReflectionParameter $param) {
+		return $fn(...array_map(function(ReflectionParameter $param) {
 			// First we try by type (more likely these days)
 			if (($type = $param->getType()) !== null) {
 				try {

lib/private/AppFramework/Bootstrap/BootContext.php

Indentation +14 added lines, -14 removed lines

@@ -31,22 +31,22 @@
 
 class BootContext implements IBootContext {
 
-	/** @var IAppContainer */
-	private $appContainer;
+    /** @var IAppContainer */
+    private $appContainer;
 
-	public function __construct(IAppContainer $appContainer) {
-		$this->appContainer = $appContainer;
-	}
+    public function __construct(IAppContainer $appContainer) {
+        $this->appContainer = $appContainer;
+    }
 
-	public function getAppContainer(): IAppContainer {
-		return $this->appContainer;
-	}
+    public function getAppContainer(): IAppContainer {
+        return $this->appContainer;
+    }
 
-	public function getServerContainer(): IServerContainer {
-		return $this->appContainer->getServer();
-	}
+    public function getServerContainer(): IServerContainer {
+        return $this->appContainer->getServer();
+    }
 
-	public function injectFn(callable $fn) {
-		return (new FunctionInjector($this->appContainer))->injectFn($fn);
-	}
+    public function injectFn(callable $fn) {
+        return (new FunctionInjector($this->appContainer))->injectFn($fn);
+    }
 }

apps/dav/lib/AppInfo/Application.php

Indentation +316 added lines, -316 removed lines

@@ -74,322 +74,322 @@
 use function strpos;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'dav';
-
-	/**
-	 * Application constructor.
-	 */
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(PhotoCache::class, function (IContainer $c) {
-			/** @var IServerContainer $server */
-			$server = $c->query(IServerContainer::class);
-
-			return new PhotoCache(
-				$server->getAppDataDir('dav-photocache'),
-				$server->getLogger()
-			);
-		});
-
-		/*
+    public const APP_ID = 'dav';
+
+    /**
+     * Application constructor.
+     */
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        $context->registerServiceAlias('CardDAVSyncService', SyncService::class);
+        $context->registerService(PhotoCache::class, function (IContainer $c) {
+            /** @var IServerContainer $server */
+            $server = $c->query(IServerContainer::class);
+
+            return new PhotoCache(
+                $server->getAppDataDir('dav-photocache'),
+                $server->getLogger()
+            );
+        });
+
+        /*
 		 * Register capabilities
 		 */
-		$context->registerCapability(Capabilities::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		// Load all dav apps
-		\OC_App::loadApps(['dav']);
-
-		$context->injectFn([$this, 'registerHooks']);
-		$context->injectFn([$this, 'registerContactsManager']);
-		$context->injectFn([$this, 'registerCalendarManager']);
-		$context->injectFn([$this, 'registerNotifier']);
-		$context->injectFn([$this, 'registerCalendarReminders']);
-	}
-
-	public function registerHooks(HookManager $hm,
-								   EventDispatcherInterface $dispatcher,
-								   IAppContainer $container,
-								   IServerContainer $serverContainer) {
-		$hm->setup();
-
-		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
-			if ($event instanceof GenericEvent) {
-				$hm->firstLogin($event->getSubject());
-			}
-		});
-
-		$birthdayListener = function ($event) use ($container) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $container->query(BirthdayService::class);
-				$b->onCardChanged(
-					(int) $event->getArgument('addressBookId'),
-					(string) $event->getArgument('cardUri'),
-					(string) $event->getArgument('cardData')
-				);
-			}
-		};
-
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $container->query(BirthdayService::class);
-				$b->onCardDeleted(
-					(int) $event->getArgument('addressBookId'),
-					(string) $event->getArgument('cardUri')
-				);
-			}
-		});
-
-		$clearPhotoCache = function ($event) use ($container) {
-			if ($event instanceof GenericEvent) {
-				/** @var PhotoCache $p */
-				$p = $container->query(PhotoCache::class);
-				$p->delete(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		};
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
-
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
-			$user = $event->getSubject();
-			/** @var SyncService $syncService */
-			$syncService = $container->query(SyncService::class);
-			$syncService->updateUser($user);
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarAdd(
-				$event->getArgument('calendarData')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarUpdate(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('propertyMutations')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarDelete(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares')
-			);
-
-			/** @var ReminderBackend $reminderBackend */
-			$reminderBackend = $container->query(ReminderBackend::class);
-			$reminderBackend->cleanRemindersForCalendar(
-				(int) $event->getArgument('calendarId')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarUpdateShares(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('add'),
-				$event->getArgument('remove')
-			);
-
-			// Here we should recalculate if reminders should be sent to new or old sharees
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarPublication(
-				$event->getArgument('calendarData'),
-				$event->getArgument('public')
-			);
-		});
-
-		$listener = function (GenericEvent $event, $eventName) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-
-			$subject = Event::SUBJECT_OBJECT_ADD;
-			if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_UPDATE;
-			} elseif ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_DELETE;
-			}
-			$backend->onTouchCalendarObject(
-				$subject,
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('objectData')
-			);
-
-			/** @var ReminderService $reminderBackend */
-			$reminderService = $container->query(ReminderService::class);
-
-			$reminderService->onTouchCalendarObject(
-				$eventName,
-				$event->getArgument('objectData')
-			);
-		};
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
-
-		/**
-		 * In case the user has set their default calendar to this one
-		 */
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($serverContainer) {
-			/** @var IConfig $config */
-			$config = $serverContainer->getConfig();
-			$principalUri = $event->getArgument('calendarData')['principaluri'];
-			if (strpos($principalUri, 'principals/users') === 0) {
-				list(, $UID) = \Sabre\Uri\split($principalUri);
-				$uri = $event->getArgument('calendarData')['uri'];
-				if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
-					$config->deleteUserValue($UID, 'dav', 'defaultCalendar');
-				}
-			}
-		});
-
-		$dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-			function (GenericEvent $event) {
-				/** @var CardDavBackend $cardDavBackend */
-				$cardDavBackend = \OC::$server->query(CardDavBackend::class);
-				$addressBookUri = $event->getSubject();
-				$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-				if (!is_null($addressBook)) {
-					$cardDavBackend->deleteAddressBook($addressBook['id']);
-				}
-			}
-		);
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
-				$jobList = $serverContainer->getJobList();
-				$subscriptionData = $event->getArgument('subscriptionData');
-
-				/**
-				 * Initial subscription refetch
-				 *
-				 * @var RefreshWebcalService $refreshWebcalService
-				 */
-				$refreshWebcalService = $container->query(RefreshWebcalService::class);
-				$refreshWebcalService->refreshSubscription(
-					(string) $subscriptionData['principaluri'],
-					(string) $subscriptionData['uri']
-				);
-
-				$jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-					'principaluri' => $subscriptionData['principaluri'],
-					'uri' => $subscriptionData['uri']
-				]);
-			}
-		);
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
-				$jobList = $serverContainer->getJobList();
-				$subscriptionData = $event->getArgument('subscriptionData');
-
-				$jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-					'principaluri' => $subscriptionData['principaluri'],
-					'uri' => $subscriptionData['uri']
-				]);
-
-				/** @var CalDavBackend $calDavBackend */
-				$calDavBackend = $container->query(CalDavBackend::class);
-				$calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
-			}
-		);
-
-		$eventHandler = function () use ($container, $serverContainer) {
-			try {
-				/** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
-				$job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
-				$job->run([]);
-				$serverContainer->getJobList()->setLastRun($job);
-			} catch (Exception $ex) {
-				$serverContainer->getLogger()->logException($ex);
-			}
-		};
-
-		$dispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
-		$dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler);
-	}
-
-	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
-			$user = \OC::$server->getUserSession()->getUser();
-			if (!is_null($user)) {
-				$this->setupContactsProvider($cm, $container, $user->getUID());
-			} else {
-				$this->setupSystemContactsProvider($cm, $container);
-			}
-		});
-	}
-
-	private function setupContactsProvider(IContactsManager $contactsManager,
-										   IAppContainer $container,
-										   string $userID): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
-
-	private function setupSystemContactsProvider(IContactsManager $contactsManager,
-												 IAppContainer $container): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
-	}
-
-	public function registerCalendarManager(ICalendarManager $calendarManager,
-											 IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager) {
-			$user = \OC::$server->getUserSession()->getUser();
-			if ($user !== null) {
-				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());
-			}
-		});
-	}
-
-	private function setupCalendarProvider(ICalendarManager $calendarManager,
-										   IAppContainer $container,
-										   $userId) {
-		$cm = $container->query(CalendarManager::class);
-		$cm->setupCalendarProvider($calendarManager, $userId);
-	}
-
-	public function registerNotifier(INotificationManager $manager): void {
-		$manager->registerNotifierService(Notifier::class);
-	}
-
-	public function registerCalendarReminders(NotificationProviderManager $manager,
-											   ILogger $logger): void {
-		try {
-			$manager->registerProvider(AudioProvider::class);
-			$manager->registerProvider(EmailProvider::class);
-			$manager->registerProvider(PushProvider::class);
-		} catch (Throwable $ex) {
-			$logger->logException($ex);
-		}
-	}
+        $context->registerCapability(Capabilities::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        // Load all dav apps
+        \OC_App::loadApps(['dav']);
+
+        $context->injectFn([$this, 'registerHooks']);
+        $context->injectFn([$this, 'registerContactsManager']);
+        $context->injectFn([$this, 'registerCalendarManager']);
+        $context->injectFn([$this, 'registerNotifier']);
+        $context->injectFn([$this, 'registerCalendarReminders']);
+    }
+
+    public function registerHooks(HookManager $hm,
+                                    EventDispatcherInterface $dispatcher,
+                                    IAppContainer $container,
+                                    IServerContainer $serverContainer) {
+        $hm->setup();
+
+        // first time login event setup
+        $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+            if ($event instanceof GenericEvent) {
+                $hm->firstLogin($event->getSubject());
+            }
+        });
+
+        $birthdayListener = function ($event) use ($container) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $container->query(BirthdayService::class);
+                $b->onCardChanged(
+                    (int) $event->getArgument('addressBookId'),
+                    (string) $event->getArgument('cardUri'),
+                    (string) $event->getArgument('cardData')
+                );
+            }
+        };
+
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $container->query(BirthdayService::class);
+                $b->onCardDeleted(
+                    (int) $event->getArgument('addressBookId'),
+                    (string) $event->getArgument('cardUri')
+                );
+            }
+        });
+
+        $clearPhotoCache = function ($event) use ($container) {
+            if ($event instanceof GenericEvent) {
+                /** @var PhotoCache $p */
+                $p = $container->query(PhotoCache::class);
+                $p->delete(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri')
+                );
+            }
+        };
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
+
+        $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
+            $user = $event->getSubject();
+            /** @var SyncService $syncService */
+            $syncService = $container->query(SyncService::class);
+            $syncService->updateUser($user);
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarAdd(
+                $event->getArgument('calendarData')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarUpdate(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('propertyMutations')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarDelete(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares')
+            );
+
+            /** @var ReminderBackend $reminderBackend */
+            $reminderBackend = $container->query(ReminderBackend::class);
+            $reminderBackend->cleanRemindersForCalendar(
+                (int) $event->getArgument('calendarId')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarUpdateShares(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('add'),
+                $event->getArgument('remove')
+            );
+
+            // Here we should recalculate if reminders should be sent to new or old sharees
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarPublication(
+                $event->getArgument('calendarData'),
+                $event->getArgument('public')
+            );
+        });
+
+        $listener = function (GenericEvent $event, $eventName) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+
+            $subject = Event::SUBJECT_OBJECT_ADD;
+            if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_UPDATE;
+            } elseif ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_DELETE;
+            }
+            $backend->onTouchCalendarObject(
+                $subject,
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('objectData')
+            );
+
+            /** @var ReminderService $reminderBackend */
+            $reminderService = $container->query(ReminderService::class);
+
+            $reminderService->onTouchCalendarObject(
+                $eventName,
+                $event->getArgument('objectData')
+            );
+        };
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
+
+        /**
+         * In case the user has set their default calendar to this one
+         */
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($serverContainer) {
+            /** @var IConfig $config */
+            $config = $serverContainer->getConfig();
+            $principalUri = $event->getArgument('calendarData')['principaluri'];
+            if (strpos($principalUri, 'principals/users') === 0) {
+                list(, $UID) = \Sabre\Uri\split($principalUri);
+                $uri = $event->getArgument('calendarData')['uri'];
+                if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
+                    $config->deleteUserValue($UID, 'dav', 'defaultCalendar');
+                }
+            }
+        });
+
+        $dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
+            function (GenericEvent $event) {
+                /** @var CardDavBackend $cardDavBackend */
+                $cardDavBackend = \OC::$server->query(CardDavBackend::class);
+                $addressBookUri = $event->getSubject();
+                $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+                if (!is_null($addressBook)) {
+                    $cardDavBackend->deleteAddressBook($addressBook['id']);
+                }
+            }
+        );
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
+            function (GenericEvent $event) use ($container, $serverContainer) {
+                $jobList = $serverContainer->getJobList();
+                $subscriptionData = $event->getArgument('subscriptionData');
+
+                /**
+                 * Initial subscription refetch
+                 *
+                 * @var RefreshWebcalService $refreshWebcalService
+                 */
+                $refreshWebcalService = $container->query(RefreshWebcalService::class);
+                $refreshWebcalService->refreshSubscription(
+                    (string) $subscriptionData['principaluri'],
+                    (string) $subscriptionData['uri']
+                );
+
+                $jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+                    'principaluri' => $subscriptionData['principaluri'],
+                    'uri' => $subscriptionData['uri']
+                ]);
+            }
+        );
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
+            function (GenericEvent $event) use ($container, $serverContainer) {
+                $jobList = $serverContainer->getJobList();
+                $subscriptionData = $event->getArgument('subscriptionData');
+
+                $jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+                    'principaluri' => $subscriptionData['principaluri'],
+                    'uri' => $subscriptionData['uri']
+                ]);
+
+                /** @var CalDavBackend $calDavBackend */
+                $calDavBackend = $container->query(CalDavBackend::class);
+                $calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
+            }
+        );
+
+        $eventHandler = function () use ($container, $serverContainer) {
+            try {
+                /** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
+                $job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
+                $job->run([]);
+                $serverContainer->getJobList()->setLastRun($job);
+            } catch (Exception $ex) {
+                $serverContainer->getLogger()->logException($ex);
+            }
+        };
+
+        $dispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
+        $dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler);
+    }
+
+    public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
+        $cm->register(function () use ($container, $cm): void {
+            $user = \OC::$server->getUserSession()->getUser();
+            if (!is_null($user)) {
+                $this->setupContactsProvider($cm, $container, $user->getUID());
+            } else {
+                $this->setupSystemContactsProvider($cm, $container);
+            }
+        });
+    }
+
+    private function setupContactsProvider(IContactsManager $contactsManager,
+                                            IAppContainer $container,
+                                            string $userID): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
+
+    private function setupSystemContactsProvider(IContactsManager $contactsManager,
+                                                    IAppContainer $container): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
+    }
+
+    public function registerCalendarManager(ICalendarManager $calendarManager,
+                                                IAppContainer $container): void {
+        $calendarManager->register(function () use ($container, $calendarManager) {
+            $user = \OC::$server->getUserSession()->getUser();
+            if ($user !== null) {
+                $this->setupCalendarProvider($calendarManager, $container, $user->getUID());
+            }
+        });
+    }
+
+    private function setupCalendarProvider(ICalendarManager $calendarManager,
+                                            IAppContainer $container,
+                                            $userId) {
+        $cm = $container->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
+
+    public function registerNotifier(INotificationManager $manager): void {
+        $manager->registerNotifierService(Notifier::class);
+    }
+
+    public function registerCalendarReminders(NotificationProviderManager $manager,
+                                                ILogger $logger): void {
+        try {
+            $manager->registerProvider(AudioProvider::class);
+            $manager->registerProvider(EmailProvider::class);
+            $manager->registerProvider(PushProvider::class);
+        } catch (Throwable $ex) {
+            $logger->logException($ex);
+        }
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -85,7 +85,7 @@ 
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(PhotoCache::class, function (IContainer $c) {
+		$context->registerService(PhotoCache::class, function(IContainer $c) {
 			/** @var IServerContainer $server */
 			$server = $c->query(IServerContainer::class);
 
@@ -119,13 +119,13 @@ 
 		$hm->setup();
 
 		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+		$dispatcher->addListener(IUser::class.'::firstLogin', function($event) use ($hm) {
 			if ($event instanceof GenericEvent) {
 				$hm->firstLogin($event->getSubject());
 			}
 		});
 
-		$birthdayListener = function ($event) use ($container) {
+		$birthdayListener = function($event) use ($container) {
 			if ($event instanceof GenericEvent) {
 				/** @var BirthdayService $b */
 				$b = $container->query(BirthdayService::class);
@@ -139,7 +139,7 @@ 
 
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function($event) use ($container) {
 			if ($event instanceof GenericEvent) {
 				/** @var BirthdayService $b */
 				$b = $container->query(BirthdayService::class);
@@ -150,7 +150,7 @@ 
 			}
 		});
 
-		$clearPhotoCache = function ($event) use ($container) {
+		$clearPhotoCache = function($event) use ($container) {
 			if ($event instanceof GenericEvent) {
 				/** @var PhotoCache $p */
 				$p = $container->query(PhotoCache::class);
@@ -163,21 +163,21 @@ 
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
 		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
 
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) use ($container) {
 			$user = $event->getSubject();
 			/** @var SyncService $syncService */
 			$syncService = $container->query(SyncService::class);
 			$syncService->updateUser($user);
 		});
 
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarAdd(
 				$event->getArgument('calendarData')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarUpdate(
@@ -186,7 +186,7 @@ 
 				$event->getArgument('propertyMutations')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarDelete(
@@ -200,7 +200,7 @@ 
 				(int) $event->getArgument('calendarId')
 			);
 		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarUpdateShares(
@@ -213,7 +213,7 @@ 
 			// Here we should recalculate if reminders should be sent to new or old sharees
 		});
 
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function(GenericEvent $event) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 			$backend->onCalendarPublication(
@@ -222,7 +222,7 @@ 
 			);
 		});
 
-		$listener = function (GenericEvent $event, $eventName) use ($container) {
+		$listener = function(GenericEvent $event, $eventName) use ($container) {
 			/** @var Backend $backend */
 			$backend = $container->query(Backend::class);
 
@@ -254,7 +254,7 @@ 
 		/**
 		 * In case the user has set their default calendar to this one
 		 */
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($serverContainer) {
+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function(GenericEvent $event) use ($serverContainer) {
 			/** @var IConfig $config */
 			$config = $serverContainer->getConfig();
 			$principalUri = $event->getArgument('calendarData')['principaluri'];
@@ -268,7 +268,7 @@ 
 		});
 
 		$dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-			function (GenericEvent $event) {
+			function(GenericEvent $event) {
 				/** @var CardDavBackend $cardDavBackend */
 				$cardDavBackend = \OC::$server->query(CardDavBackend::class);
 				$addressBookUri = $event->getSubject();
@@ -280,7 +280,7 @@ 
 		);
 
 		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
+			function(GenericEvent $event) use ($container, $serverContainer) {
 				$jobList = $serverContainer->getJobList();
 				$subscriptionData = $event->getArgument('subscriptionData');
 
@@ -303,7 +303,7 @@ 
 		);
 
 		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
+			function(GenericEvent $event) use ($container, $serverContainer) {
 				$jobList = $serverContainer->getJobList();
 				$subscriptionData = $event->getArgument('subscriptionData');
 
@@ -318,7 +318,7 @@ 
 			}
 		);
 
-		$eventHandler = function () use ($container, $serverContainer) {
+		$eventHandler = function() use ($container, $serverContainer) {
 			try {
 				/** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
 				$job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
@@ -334,7 +334,7 @@ 
 	}
 
 	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
+		$cm->register(function() use ($container, $cm): void {
 			$user = \OC::$server->getUserSession()->getUser();
 			if (!is_null($user)) {
 				$this->setupContactsProvider($cm, $container, $user->getUID());
@@ -363,7 +363,7 @@ 
 
 	public function registerCalendarManager(ICalendarManager $calendarManager,
 											 IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager) {
+		$calendarManager->register(function() use ($container, $calendarManager) {
 			$user = \OC::$server->getUserSession()->getUser();
 			if ($user !== null) {
 				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());

apps/accessibility/lib/AppInfo/Application.php

Indentation +39 added lines, -39 removed lines

@@ -45,49 +45,49 @@
 
 class Application extends App implements IBootstrap {
 
-	/** @var string */
-	public const APP_ID = 'accessibility';
+    /** @var string */
+    public const APP_ID = 'accessibility';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-	}
+    public function register(IRegistrationContext $context): void {
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn([$this, 'injectCss']);
-		$context->injectFn([$this, 'registerInitialState']);
-	}
+    public function boot(IBootContext $context): void {
+        $context->injectFn([$this, 'injectCss']);
+        $context->injectFn([$this, 'registerInitialState']);
+    }
 
-	public function injectCss(IUserSession $userSession,
-							   IConfig $config,
-							   IURLGenerator $urlGenerator) {
-		// Inject the fake css on all pages if enabled and user is logged
-		$loggedUser = $userSession->getUser();
-		if ($loggedUser !== null) {
-			$userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
-			// we want to check if any theme or font is enabled.
-			if (count($userValues) > 0) {
-				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
-				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
-			}
-		} else {
-			$userValues = ['dark'];
+    public function injectCss(IUserSession $userSession,
+                                IConfig $config,
+                                IURLGenerator $urlGenerator) {
+        // Inject the fake css on all pages if enabled and user is logged
+        $loggedUser = $userSession->getUser();
+        if ($loggedUser !== null) {
+            $userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
+            // we want to check if any theme or font is enabled.
+            if (count($userValues) > 0) {
+                $hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
+                $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+                \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
+            }
+        } else {
+            $userValues = ['dark'];
 
-			$hash = md5(implode('-', $userValues));
-			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
-			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
-		}
-	}
+            $hash = md5(implode('-', $userValues));
+            $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+            \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
+        }
+    }
 
-	public function registerInitialState(IInitialStateService $initialState,
-										  IAppContainer $container) {
-		$initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) {
-			/** @var JSDataService $data */
-			$data = $container->query(JSDataService::class);
-			return $data;
-		});
-	}
+    public function registerInitialState(IInitialStateService $initialState,
+                                            IAppContainer $container) {
+        $initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) {
+            /** @var JSDataService $data */
+            $data = $container->query(JSDataService::class);
+            return $data;
+        });
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -70,21 +70,21 @@
 			// we want to check if any theme or font is enabled.
 			if (count($userValues) > 0) {
 				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
 		} else {
 			$userValues = ['dark'];
 
 			$hash = md5(implode('-', $userValues));
-			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
 			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
 		}
 	}
 
 	public function registerInitialState(IInitialStateService $initialState,
 										  IAppContainer $container) {
-		$initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) {
+		$initialState->provideLazyInitialState(self::APP_ID, 'data', function() use ($container) {
 			/** @var JSDataService $data */
 			$data = $container->query(JSDataService::class);
 			return $data;

apps/admin_audit/lib/AppInfo/Application.php

Indentation +209 added lines, -209 removed lines

@@ -68,220 +68,220 @@
 
 class Application extends App implements IBootstrap {
 
-	/** @var ILogger */
-	protected $logger;
+    /** @var ILogger */
+    protected $logger;
 
-	public function __construct() {
-		parent::__construct('admin_audit');
-	}
+    public function __construct() {
+        parent::__construct('admin_audit');
+    }
 
-	public function register(IRegistrationContext $context): void {
-	}
+    public function register(IRegistrationContext $context): void {
+    }
 
-	public function boot(IBootContext $context): void {
-		/** @var ILogger $logger */
-		$logger = $context->injectFn(
-			Closure::fromCallable([$this, 'getLogger'])
-		);
+    public function boot(IBootContext $context): void {
+        /** @var ILogger $logger */
+        $logger = $context->injectFn(
+            Closure::fromCallable([$this, 'getLogger'])
+        );
 
-		/*
+        /*
 		 * TODO: once the hooks are migrated to lazy events, this should be done
 		 *       in \OCA\AdminAudit\AppInfo\Application::register
 		 */
-		$this->registerHooks($logger, $context->getServerContainer());
-	}
-
-	private function getLogger(IConfig $config,
-							   ILogger $logger,
-							   ILogFactory $logFactory): ILogger {
-		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-		$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-
-		if ($logFile === null) {
-			return $logger;
-		}
-		return $logFactory->getCustomLogger($logFile);
-	}
-
-	/**
-	 * Register hooks in order to log them
-	 */
-	private function registerHooks(ILogger $logger,
-									 IServerContainer $serverContainer) {
-		$this->userManagementHooks($logger, $serverContainer);
-		$this->groupHooks($logger, $serverContainer);
-		$this->authHooks($logger);
-
-		$this->consoleHooks($logger, $serverContainer);
-		$this->appHooks($logger, $serverContainer);
-
-		$this->sharingHooks($logger);
-
-		$this->fileHooks($logger, $serverContainer);
-		$this->trashbinHooks($logger);
-		$this->versionsHooks($logger);
-
-		$this->securityHooks($logger, $serverContainer);
-	}
-
-	private function userManagementHooks(ILogger $logger,
-										   IServerContainer $serverContainer) {
-		$userActions = new UserManagement($logger);
-
-		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
-		Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
-
-		/** @var IUserSession|Session $userSession */
-		$userSession = $serverContainer->getUserSession();
-		$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-		$userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
-		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
-	}
-
-	private function groupHooks(ILogger $logger,
-								  IServerContainer $serverContainer) {
-		$groupActions = new GroupManagement($logger);
-
-		/** @var IGroupManager|Manager $groupManager */
-		$groupManager = $serverContainer->getGroupManager();
-		$groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
-		$groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
-		$groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
-		$groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
-	}
-
-	private function sharingHooks(ILogger $logger) {
-		$shareActions = new Sharing($logger);
-
-		Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
-		Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
-	}
-
-	private function authHooks(ILogger $logger) {
-		$authActions = new Auth($logger);
-
-		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
-		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
-		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
-	}
-
-	private function appHooks(ILogger $logger,
-								IServerContainer $serverContainer) {
-		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->enableApp($event->getAppID());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
-			$appActions = new AppManagement($logger);
-			$appActions->disableApp($event->getAppID());
-		});
-	}
-
-	private function consoleHooks(ILogger $logger,
-									IServerContainer $serverContainer) {
-		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
-			$appActions = new Console($logger);
-			$appActions->runCommand($event->getArguments());
-		});
-	}
-
-	private function fileHooks(ILogger $logger,
-								 IServerContainer $serverContainer) {
-		$fileActions = new Files($logger);
-		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(
-			IPreview::EVENT,
-			function (GenericEvent $event) use ($fileActions) {
-				/** @var File $file */
-				$file = $event->getSubject();
-				$fileActions->preview([
-					'path' => mb_substr($file->getInternalPath(), 5),
-					'width' => $event->getArguments()['width'],
-					'height' => $event->getArguments()['height'],
-					'crop' => $event->getArguments()['crop'],
-					'mode' => $event->getArguments()['mode']
-				]);
-			}
-		);
-
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_rename,
-			$fileActions,
-			'rename'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_create,
-			$fileActions,
-			'create'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_copy,
-			$fileActions,
-			'copy'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_write,
-			$fileActions,
-			'write'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_update,
-			$fileActions,
-			'update'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_read,
-			$fileActions,
-			'read'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_delete,
-			$fileActions,
-			'delete'
-		);
-	}
-
-	private function versionsHooks(ILogger $logger) {
-		$versionsActions = new Versions($logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
-	}
-
-	private function trashbinHooks(ILogger $logger) {
-		$trashActions = new Trashbin($logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
-
-	private function securityHooks(ILogger $logger,
-									 IServerContainer $serverContainer) {
-		$eventDispatcher = $serverContainer->getEventDispatcher();
-		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
-			$security = new Security($logger);
-			$security->twofactorSuccess($event->getSubject(), $event->getArguments());
-		});
-		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
-			$security = new Security($logger);
-			$security->twofactorFailed($event->getSubject(), $event->getArguments());
-		});
-	}
+        $this->registerHooks($logger, $context->getServerContainer());
+    }
+
+    private function getLogger(IConfig $config,
+                                ILogger $logger,
+                                ILogFactory $logFactory): ILogger {
+        $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+        $logFile = $config->getAppValue('admin_audit', 'logfile', $default);
+
+        if ($logFile === null) {
+            return $logger;
+        }
+        return $logFactory->getCustomLogger($logFile);
+    }
+
+    /**
+     * Register hooks in order to log them
+     */
+    private function registerHooks(ILogger $logger,
+                                        IServerContainer $serverContainer) {
+        $this->userManagementHooks($logger, $serverContainer);
+        $this->groupHooks($logger, $serverContainer);
+        $this->authHooks($logger);
+
+        $this->consoleHooks($logger, $serverContainer);
+        $this->appHooks($logger, $serverContainer);
+
+        $this->sharingHooks($logger);
+
+        $this->fileHooks($logger, $serverContainer);
+        $this->trashbinHooks($logger);
+        $this->versionsHooks($logger);
+
+        $this->securityHooks($logger, $serverContainer);
+    }
+
+    private function userManagementHooks(ILogger $logger,
+                                            IServerContainer $serverContainer) {
+        $userActions = new UserManagement($logger);
+
+        Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
+        Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
+        Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
+
+        /** @var IUserSession|Session $userSession */
+        $userSession = $serverContainer->getUserSession();
+        $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+        $userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
+        $userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
+    }
+
+    private function groupHooks(ILogger $logger,
+                                    IServerContainer $serverContainer) {
+        $groupActions = new GroupManagement($logger);
+
+        /** @var IGroupManager|Manager $groupManager */
+        $groupManager = $serverContainer->getGroupManager();
+        $groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
+        $groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
+        $groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
+        $groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
+    }
+
+    private function sharingHooks(ILogger $logger) {
+        $shareActions = new Sharing($logger);
+
+        Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
+        Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
+        Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare');
+        Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
+        Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
+        Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+        Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
+    }
+
+    private function authHooks(ILogger $logger) {
+        $authActions = new Auth($logger);
+
+        Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+        Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+        Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+    }
+
+    private function appHooks(ILogger $logger,
+                                IServerContainer $serverContainer) {
+        $eventDispatcher = $serverContainer->getEventDispatcher();
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->enableApp($event->getAppID());
+        });
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
+        });
+        $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) {
+            $appActions = new AppManagement($logger);
+            $appActions->disableApp($event->getAppID());
+        });
+    }
+
+    private function consoleHooks(ILogger $logger,
+                                    IServerContainer $serverContainer) {
+        $eventDispatcher = $serverContainer->getEventDispatcher();
+        $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
+            $appActions = new Console($logger);
+            $appActions->runCommand($event->getArguments());
+        });
+    }
+
+    private function fileHooks(ILogger $logger,
+                                    IServerContainer $serverContainer) {
+        $fileActions = new Files($logger);
+        $eventDispatcher = $serverContainer->getEventDispatcher();
+        $eventDispatcher->addListener(
+            IPreview::EVENT,
+            function (GenericEvent $event) use ($fileActions) {
+                /** @var File $file */
+                $file = $event->getSubject();
+                $fileActions->preview([
+                    'path' => mb_substr($file->getInternalPath(), 5),
+                    'width' => $event->getArguments()['width'],
+                    'height' => $event->getArguments()['height'],
+                    'crop' => $event->getArguments()['crop'],
+                    'mode' => $event->getArguments()['mode']
+                ]);
+            }
+        );
+
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_rename,
+            $fileActions,
+            'rename'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_create,
+            $fileActions,
+            'create'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_copy,
+            $fileActions,
+            'copy'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_write,
+            $fileActions,
+            'write'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_update,
+            $fileActions,
+            'update'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_read,
+            $fileActions,
+            'read'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_delete,
+            $fileActions,
+            'delete'
+        );
+    }
+
+    private function versionsHooks(ILogger $logger) {
+        $versionsActions = new Versions($logger);
+        Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+        Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
+    }
+
+    private function trashbinHooks(ILogger $logger) {
+        $trashActions = new Trashbin($logger);
+        Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+        Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+    }
+
+    private function securityHooks(ILogger $logger,
+                                        IServerContainer $serverContainer) {
+        $eventDispatcher = $serverContainer->getEventDispatcher();
+        $eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
+            $security = new Security($logger);
+            $security->twofactorSuccess($event->getSubject(), $event->getArguments());
+        });
+        $eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) {
+            $security = new Security($logger);
+            $security->twofactorFailed($event->getSubject(), $event->getArguments());
+        });
+    }
 }