@@ -35,56 +35,56 @@ |
||
| 35 | 35 | use Symfony\Component\EventDispatcher\EventDispatcher; |
| 36 | 36 | |
| 37 | 37 | class Application extends App implements IBootstrap { |
| 38 | - public const APP_ID = 'systemtags'; |
|
| 38 | + public const APP_ID = 'systemtags'; |
|
| 39 | 39 | |
| 40 | - public function __construct() { |
|
| 41 | - parent::__construct(self::APP_ID); |
|
| 42 | - } |
|
| 40 | + public function __construct() { |
|
| 41 | + parent::__construct(self::APP_ID); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - public function register(IRegistrationContext $context): void { |
|
| 45 | - } |
|
| 44 | + public function register(IRegistrationContext $context): void { |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - public function boot(IBootContext $context): void { |
|
| 48 | - $context->injectFn(function (EventDispatcher $dispatcher) use ($context) { |
|
| 49 | - /* |
|
| 47 | + public function boot(IBootContext $context): void { |
|
| 48 | + $context->injectFn(function (EventDispatcher $dispatcher) use ($context) { |
|
| 49 | + /* |
|
| 50 | 50 | * @todo move the OCP events and then move the registration to `register` |
| 51 | 51 | */ |
| 52 | - $dispatcher->addListener( |
|
| 53 | - 'OCA\Files::loadAdditionalScripts', |
|
| 54 | - function () { |
|
| 55 | - // FIXME: no public API for these ? |
|
| 56 | - \OCP\Util::addScript('dist/systemtags'); |
|
| 57 | - \OCP\Util::addScript(self::APP_ID, 'systemtags'); |
|
| 58 | - } |
|
| 59 | - ); |
|
| 52 | + $dispatcher->addListener( |
|
| 53 | + 'OCA\Files::loadAdditionalScripts', |
|
| 54 | + function () { |
|
| 55 | + // FIXME: no public API for these ? |
|
| 56 | + \OCP\Util::addScript('dist/systemtags'); |
|
| 57 | + \OCP\Util::addScript(self::APP_ID, 'systemtags'); |
|
| 58 | + } |
|
| 59 | + ); |
|
| 60 | 60 | |
| 61 | - $managerListener = function (ManagerEvent $event) use ($context) { |
|
| 62 | - /** @var \OCA\SystemTags\Activity\Listener $listener */ |
|
| 63 | - $listener = $context->getServerContainer()->query(Listener::class); |
|
| 64 | - $listener->event($event); |
|
| 65 | - }; |
|
| 66 | - $dispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener); |
|
| 67 | - $dispatcher->addListener(ManagerEvent::EVENT_DELETE, $managerListener); |
|
| 68 | - $dispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener); |
|
| 61 | + $managerListener = function (ManagerEvent $event) use ($context) { |
|
| 62 | + /** @var \OCA\SystemTags\Activity\Listener $listener */ |
|
| 63 | + $listener = $context->getServerContainer()->query(Listener::class); |
|
| 64 | + $listener->event($event); |
|
| 65 | + }; |
|
| 66 | + $dispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener); |
|
| 67 | + $dispatcher->addListener(ManagerEvent::EVENT_DELETE, $managerListener); |
|
| 68 | + $dispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener); |
|
| 69 | 69 | |
| 70 | - $mapperListener = function (MapperEvent $event) use ($context) { |
|
| 71 | - /** @var \OCA\SystemTags\Activity\Listener $listener */ |
|
| 72 | - $listener = $context->getServerContainer()->query(Listener::class); |
|
| 73 | - $listener->mapperEvent($event); |
|
| 74 | - }; |
|
| 75 | - $dispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener); |
|
| 76 | - $dispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener); |
|
| 77 | - }); |
|
| 70 | + $mapperListener = function (MapperEvent $event) use ($context) { |
|
| 71 | + /** @var \OCA\SystemTags\Activity\Listener $listener */ |
|
| 72 | + $listener = $context->getServerContainer()->query(Listener::class); |
|
| 73 | + $listener->mapperEvent($event); |
|
| 74 | + }; |
|
| 75 | + $dispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener); |
|
| 76 | + $dispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener); |
|
| 77 | + }); |
|
| 78 | 78 | |
| 79 | - \OCA\Files\App::getNavigationManager()->add(function () { |
|
| 80 | - $l = \OC::$server->getL10N(self::APP_ID); |
|
| 81 | - return [ |
|
| 82 | - 'id' => 'systemtagsfilter', |
|
| 83 | - 'appname' => self::APP_ID, |
|
| 84 | - 'script' => 'list.php', |
|
| 85 | - 'order' => 25, |
|
| 86 | - 'name' => $l->t('Tags'), |
|
| 87 | - ]; |
|
| 88 | - }); |
|
| 89 | - } |
|
| 79 | + \OCA\Files\App::getNavigationManager()->add(function () { |
|
| 80 | + $l = \OC::$server->getL10N(self::APP_ID); |
|
| 81 | + return [ |
|
| 82 | + 'id' => 'systemtagsfilter', |
|
| 83 | + 'appname' => self::APP_ID, |
|
| 84 | + 'script' => 'list.php', |
|
| 85 | + 'order' => 25, |
|
| 86 | + 'name' => $l->t('Tags'), |
|
| 87 | + ]; |
|
| 88 | + }); |
|
| 89 | + } |
|
| 90 | 90 | } |
@@ -45,20 +45,20 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function boot(IBootContext $context): void { |
| 48 | - $context->injectFn(function (EventDispatcher $dispatcher) use ($context) { |
|
| 48 | + $context->injectFn(function(EventDispatcher $dispatcher) use ($context) { |
|
| 49 | 49 | /* |
| 50 | 50 | * @todo move the OCP events and then move the registration to `register` |
| 51 | 51 | */ |
| 52 | 52 | $dispatcher->addListener( |
| 53 | 53 | 'OCA\Files::loadAdditionalScripts', |
| 54 | - function () { |
|
| 54 | + function() { |
|
| 55 | 55 | // FIXME: no public API for these ? |
| 56 | 56 | \OCP\Util::addScript('dist/systemtags'); |
| 57 | 57 | \OCP\Util::addScript(self::APP_ID, 'systemtags'); |
| 58 | 58 | } |
| 59 | 59 | ); |
| 60 | 60 | |
| 61 | - $managerListener = function (ManagerEvent $event) use ($context) { |
|
| 61 | + $managerListener = function(ManagerEvent $event) use ($context) { |
|
| 62 | 62 | /** @var \OCA\SystemTags\Activity\Listener $listener */ |
| 63 | 63 | $listener = $context->getServerContainer()->query(Listener::class); |
| 64 | 64 | $listener->event($event); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $dispatcher->addListener(ManagerEvent::EVENT_DELETE, $managerListener); |
| 68 | 68 | $dispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener); |
| 69 | 69 | |
| 70 | - $mapperListener = function (MapperEvent $event) use ($context) { |
|
| 70 | + $mapperListener = function(MapperEvent $event) use ($context) { |
|
| 71 | 71 | /** @var \OCA\SystemTags\Activity\Listener $listener */ |
| 72 | 72 | $listener = $context->getServerContainer()->query(Listener::class); |
| 73 | 73 | $listener->mapperEvent($event); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $dispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener); |
| 77 | 77 | }); |
| 78 | 78 | |
| 79 | - \OCA\Files\App::getNavigationManager()->add(function () { |
|
| 79 | + \OCA\Files\App::getNavigationManager()->add(function() { |
|
| 80 | 80 | $l = \OC::$server->getL10N(self::APP_ID); |
| 81 | 81 | return [ |
| 82 | 82 | 'id' => 'systemtagsfilter', |
@@ -52,86 +52,86 @@ |
||
| 52 | 52 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
| 53 | 53 | |
| 54 | 54 | class Application extends App implements IBootstrap { |
| 55 | - public function __construct() { |
|
| 56 | - parent::__construct('user_ldap'); |
|
| 57 | - $container = $this->getContainer(); |
|
| 58 | - |
|
| 59 | - /** |
|
| 60 | - * Controller |
|
| 61 | - */ |
|
| 62 | - $container->registerService('RenewPasswordController', function (IAppContainer $appContainer) { |
|
| 63 | - /** @var IServerContainer $server */ |
|
| 64 | - $server = $appContainer->get(IServerContainer::class); |
|
| 65 | - |
|
| 66 | - return new RenewPasswordController( |
|
| 67 | - $appContainer->get('AppName'), |
|
| 68 | - $server->getRequest(), |
|
| 69 | - $appContainer->get('UserManager'), |
|
| 70 | - $server->getConfig(), |
|
| 71 | - $appContainer->get(IL10N::class), |
|
| 72 | - $appContainer->get('Session'), |
|
| 73 | - $server->getURLGenerator() |
|
| 74 | - ); |
|
| 75 | - }); |
|
| 76 | - |
|
| 77 | - $container->registerService(ILDAPWrapper::class, function () { |
|
| 78 | - return new LDAP(); |
|
| 79 | - }); |
|
| 80 | - } |
|
| 81 | - |
|
| 82 | - public function register(IRegistrationContext $context): void { |
|
| 83 | - } |
|
| 84 | - |
|
| 85 | - public function boot(IBootContext $context): void { |
|
| 86 | - $context->injectFn(function (IConfig $config, |
|
| 87 | - INotificationManager $notificationManager, |
|
| 88 | - IUserSession $userSession, |
|
| 89 | - IAppContainer $appContainer, |
|
| 90 | - EventDispatcherInterface $dispatcher, |
|
| 91 | - IGroupManager $groupManager) { |
|
| 92 | - $helper = new Helper($config); |
|
| 93 | - $configPrefixes = $helper->getServerConfigurationPrefixes(true); |
|
| 94 | - if (count($configPrefixes) > 0) { |
|
| 95 | - $ldapWrapper = new LDAP(); |
|
| 96 | - |
|
| 97 | - $notificationManager->registerNotifierService(Notifier::class); |
|
| 98 | - |
|
| 99 | - $userPluginManager = $appContainer->get(UserPluginManager::class); |
|
| 100 | - $groupPluginManager = $appContainer->get(GroupPluginManager::class); |
|
| 101 | - |
|
| 102 | - $userBackend = new User_Proxy( |
|
| 103 | - $configPrefixes, $ldapWrapper, $config, $notificationManager, $userSession, $userPluginManager |
|
| 104 | - ); |
|
| 105 | - $groupBackend = new Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager); |
|
| 106 | - // register user backend |
|
| 107 | - \OC_User::useBackend($userBackend); |
|
| 108 | - |
|
| 109 | - // Hook to allow plugins to work on registered backends |
|
| 110 | - $dispatcher->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded'); |
|
| 111 | - |
|
| 112 | - $groupManager->addBackend($groupBackend); |
|
| 113 | - } |
|
| 114 | - }); |
|
| 115 | - |
|
| 116 | - $context->injectFn(Closure::fromCallable([$this, 'registerBackendDependents'])); |
|
| 117 | - |
|
| 118 | - \OCP\Util::connectHook( |
|
| 119 | - '\OCA\Files_Sharing\API\Server2Server', |
|
| 120 | - 'preLoginNameUsedAsUserName', |
|
| 121 | - '\OCA\User_LDAP\Helper', |
|
| 122 | - 'loginName2UserName' |
|
| 123 | - ); |
|
| 124 | - } |
|
| 125 | - |
|
| 126 | - private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher) { |
|
| 127 | - $dispatcher->addListener( |
|
| 128 | - 'OCA\\Files_External::loadAdditionalBackends', |
|
| 129 | - function () use ($appContainer) { |
|
| 130 | - $storagesBackendService = $appContainer->get(BackendService::class); |
|
| 131 | - $storagesBackendService->registerConfigHandler('home', function () use ($appContainer) { |
|
| 132 | - return $appContainer->get(ExtStorageConfigHandler::class); |
|
| 133 | - }); |
|
| 134 | - } |
|
| 135 | - ); |
|
| 136 | - } |
|
| 55 | + public function __construct() { |
|
| 56 | + parent::__construct('user_ldap'); |
|
| 57 | + $container = $this->getContainer(); |
|
| 58 | + |
|
| 59 | + /** |
|
| 60 | + * Controller |
|
| 61 | + */ |
|
| 62 | + $container->registerService('RenewPasswordController', function (IAppContainer $appContainer) { |
|
| 63 | + /** @var IServerContainer $server */ |
|
| 64 | + $server = $appContainer->get(IServerContainer::class); |
|
| 65 | + |
|
| 66 | + return new RenewPasswordController( |
|
| 67 | + $appContainer->get('AppName'), |
|
| 68 | + $server->getRequest(), |
|
| 69 | + $appContainer->get('UserManager'), |
|
| 70 | + $server->getConfig(), |
|
| 71 | + $appContainer->get(IL10N::class), |
|
| 72 | + $appContainer->get('Session'), |
|
| 73 | + $server->getURLGenerator() |
|
| 74 | + ); |
|
| 75 | + }); |
|
| 76 | + |
|
| 77 | + $container->registerService(ILDAPWrapper::class, function () { |
|
| 78 | + return new LDAP(); |
|
| 79 | + }); |
|
| 80 | + } |
|
| 81 | + |
|
| 82 | + public function register(IRegistrationContext $context): void { |
|
| 83 | + } |
|
| 84 | + |
|
| 85 | + public function boot(IBootContext $context): void { |
|
| 86 | + $context->injectFn(function (IConfig $config, |
|
| 87 | + INotificationManager $notificationManager, |
|
| 88 | + IUserSession $userSession, |
|
| 89 | + IAppContainer $appContainer, |
|
| 90 | + EventDispatcherInterface $dispatcher, |
|
| 91 | + IGroupManager $groupManager) { |
|
| 92 | + $helper = new Helper($config); |
|
| 93 | + $configPrefixes = $helper->getServerConfigurationPrefixes(true); |
|
| 94 | + if (count($configPrefixes) > 0) { |
|
| 95 | + $ldapWrapper = new LDAP(); |
|
| 96 | + |
|
| 97 | + $notificationManager->registerNotifierService(Notifier::class); |
|
| 98 | + |
|
| 99 | + $userPluginManager = $appContainer->get(UserPluginManager::class); |
|
| 100 | + $groupPluginManager = $appContainer->get(GroupPluginManager::class); |
|
| 101 | + |
|
| 102 | + $userBackend = new User_Proxy( |
|
| 103 | + $configPrefixes, $ldapWrapper, $config, $notificationManager, $userSession, $userPluginManager |
|
| 104 | + ); |
|
| 105 | + $groupBackend = new Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager); |
|
| 106 | + // register user backend |
|
| 107 | + \OC_User::useBackend($userBackend); |
|
| 108 | + |
|
| 109 | + // Hook to allow plugins to work on registered backends |
|
| 110 | + $dispatcher->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded'); |
|
| 111 | + |
|
| 112 | + $groupManager->addBackend($groupBackend); |
|
| 113 | + } |
|
| 114 | + }); |
|
| 115 | + |
|
| 116 | + $context->injectFn(Closure::fromCallable([$this, 'registerBackendDependents'])); |
|
| 117 | + |
|
| 118 | + \OCP\Util::connectHook( |
|
| 119 | + '\OCA\Files_Sharing\API\Server2Server', |
|
| 120 | + 'preLoginNameUsedAsUserName', |
|
| 121 | + '\OCA\User_LDAP\Helper', |
|
| 122 | + 'loginName2UserName' |
|
| 123 | + ); |
|
| 124 | + } |
|
| 125 | + |
|
| 126 | + private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher) { |
|
| 127 | + $dispatcher->addListener( |
|
| 128 | + 'OCA\\Files_External::loadAdditionalBackends', |
|
| 129 | + function () use ($appContainer) { |
|
| 130 | + $storagesBackendService = $appContainer->get(BackendService::class); |
|
| 131 | + $storagesBackendService->registerConfigHandler('home', function () use ($appContainer) { |
|
| 132 | + return $appContainer->get(ExtStorageConfigHandler::class); |
|
| 133 | + }); |
|
| 134 | + } |
|
| 135 | + ); |
|
| 136 | + } |
|
| 137 | 137 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | /** |
| 60 | 60 | * Controller |
| 61 | 61 | */ |
| 62 | - $container->registerService('RenewPasswordController', function (IAppContainer $appContainer) { |
|
| 62 | + $container->registerService('RenewPasswordController', function(IAppContainer $appContainer) { |
|
| 63 | 63 | /** @var IServerContainer $server */ |
| 64 | 64 | $server = $appContainer->get(IServerContainer::class); |
| 65 | 65 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | ); |
| 75 | 75 | }); |
| 76 | 76 | |
| 77 | - $container->registerService(ILDAPWrapper::class, function () { |
|
| 77 | + $container->registerService(ILDAPWrapper::class, function() { |
|
| 78 | 78 | return new LDAP(); |
| 79 | 79 | }); |
| 80 | 80 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | public function boot(IBootContext $context): void { |
| 86 | - $context->injectFn(function (IConfig $config, |
|
| 86 | + $context->injectFn(function(IConfig $config, |
|
| 87 | 87 | INotificationManager $notificationManager, |
| 88 | 88 | IUserSession $userSession, |
| 89 | 89 | IAppContainer $appContainer, |
@@ -126,9 +126,9 @@ discard block |
||
| 126 | 126 | private function registerBackendDependents(IAppContainer $appContainer, EventDispatcherInterface $dispatcher) { |
| 127 | 127 | $dispatcher->addListener( |
| 128 | 128 | 'OCA\\Files_External::loadAdditionalBackends', |
| 129 | - function () use ($appContainer) { |
|
| 129 | + function() use ($appContainer) { |
|
| 130 | 130 | $storagesBackendService = $appContainer->get(BackendService::class); |
| 131 | - $storagesBackendService->registerConfigHandler('home', function () use ($appContainer) { |
|
| 131 | + $storagesBackendService->registerConfigHandler('home', function() use ($appContainer) { |
|
| 132 | 132 | return $appContainer->get(ExtStorageConfigHandler::class); |
| 133 | 133 | }); |
| 134 | 134 | } |
@@ -40,31 +40,31 @@ |
||
| 40 | 40 | use Symfony\Component\EventDispatcher\GenericEvent; |
| 41 | 41 | |
| 42 | 42 | class Application extends App implements IBootstrap { |
| 43 | - public const APP_ID = 'lookup_server_connector'; |
|
| 43 | + public const APP_ID = 'lookup_server_connector'; |
|
| 44 | 44 | |
| 45 | - public function __construct() { |
|
| 46 | - parent::__construct(self::APP_ID); |
|
| 47 | - } |
|
| 45 | + public function __construct() { |
|
| 46 | + parent::__construct(self::APP_ID); |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - public function register(IRegistrationContext $context): void { |
|
| 50 | - } |
|
| 49 | + public function register(IRegistrationContext $context): void { |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - public function boot(IBootContext $context): void { |
|
| 53 | - $context->injectFn(Closure::fromCallable([$this, 'registerEventListeners'])); |
|
| 54 | - } |
|
| 52 | + public function boot(IBootContext $context): void { |
|
| 53 | + $context->injectFn(Closure::fromCallable([$this, 'registerEventListeners'])); |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * @todo move the OCP events and then move the registration to `register` |
|
| 58 | - */ |
|
| 59 | - private function registerEventListeners(IEventDispatcher $dispatcher, |
|
| 60 | - IAppContainer $appContainer): void { |
|
| 61 | - $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) { |
|
| 62 | - /** @var IUser $user */ |
|
| 63 | - $user = $event->getSubject(); |
|
| 56 | + /** |
|
| 57 | + * @todo move the OCP events and then move the registration to `register` |
|
| 58 | + */ |
|
| 59 | + private function registerEventListeners(IEventDispatcher $dispatcher, |
|
| 60 | + IAppContainer $appContainer): void { |
|
| 61 | + $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) { |
|
| 62 | + /** @var IUser $user */ |
|
| 63 | + $user = $event->getSubject(); |
|
| 64 | 64 | |
| 65 | - /** @var UpdateLookupServer $updateLookupServer */ |
|
| 66 | - $updateLookupServer = $appContainer->get(UpdateLookupServer::class); |
|
| 67 | - $updateLookupServer->userUpdated($user); |
|
| 68 | - }); |
|
| 69 | - } |
|
| 65 | + /** @var UpdateLookupServer $updateLookupServer */ |
|
| 66 | + $updateLookupServer = $appContainer->get(UpdateLookupServer::class); |
|
| 67 | + $updateLookupServer->userUpdated($user); |
|
| 68 | + }); |
|
| 69 | + } |
|
| 70 | 70 | } |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | */ |
| 59 | 59 | private function registerEventListeners(IEventDispatcher $dispatcher, |
| 60 | 60 | IAppContainer $appContainer): void { |
| 61 | - $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) { |
|
| 61 | + $dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) use ($appContainer) { |
|
| 62 | 62 | /** @var IUser $user */ |
| 63 | 63 | $user = $event->getSubject(); |
| 64 | 64 | |
@@ -68,215 +68,215 @@ |
||
| 68 | 68 | |
| 69 | 69 | class Application extends App implements IBootstrap { |
| 70 | 70 | |
| 71 | - /** @var ILogger */ |
|
| 72 | - protected $logger; |
|
| 71 | + /** @var ILogger */ |
|
| 72 | + protected $logger; |
|
| 73 | 73 | |
| 74 | - public function __construct() { |
|
| 75 | - parent::__construct('admin_audit'); |
|
| 76 | - } |
|
| 74 | + public function __construct() { |
|
| 75 | + parent::__construct('admin_audit'); |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - public function register(IRegistrationContext $context): void { |
|
| 79 | - } |
|
| 78 | + public function register(IRegistrationContext $context): void { |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | - public function boot(IBootContext $context): void { |
|
| 82 | - /** @var ILogger $logger */ |
|
| 83 | - $logger = $context->injectFn( |
|
| 84 | - Closure::fromCallable([$this, 'getLogger']) |
|
| 85 | - ); |
|
| 81 | + public function boot(IBootContext $context): void { |
|
| 82 | + /** @var ILogger $logger */ |
|
| 83 | + $logger = $context->injectFn( |
|
| 84 | + Closure::fromCallable([$this, 'getLogger']) |
|
| 85 | + ); |
|
| 86 | 86 | |
| 87 | - /* |
|
| 87 | + /* |
|
| 88 | 88 | * TODO: once the hooks are migrated to lazy events, this should be done |
| 89 | 89 | * in \OCA\AdminAudit\AppInfo\Application::register |
| 90 | 90 | */ |
| 91 | - $this->registerHooks($logger, $context->getServerContainer()); |
|
| 92 | - } |
|
| 93 | - |
|
| 94 | - private function getLogger(IConfig $config, |
|
| 95 | - ILogger $logger, |
|
| 96 | - ILogFactory $logFactory): ILogger { |
|
| 97 | - $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log'; |
|
| 98 | - $logFile = $config->getAppValue('admin_audit', 'logfile', $default); |
|
| 99 | - |
|
| 100 | - if ($logFile === null) { |
|
| 101 | - return $logger; |
|
| 102 | - } |
|
| 103 | - return $logFactory->getCustomLogger($logFile); |
|
| 104 | - } |
|
| 105 | - |
|
| 106 | - /** |
|
| 107 | - * Register hooks in order to log them |
|
| 108 | - */ |
|
| 109 | - private function registerHooks(ILogger $logger, |
|
| 110 | - IServerContainer $serverContainer) { |
|
| 111 | - $this->userManagementHooks($logger, $serverContainer->get(IUserSession::class)); |
|
| 112 | - $this->groupHooks($logger, $serverContainer->get(IGroupManager::class)); |
|
| 113 | - $this->authHooks($logger); |
|
| 114 | - |
|
| 115 | - /** @var EventDispatcherInterface $eventDispatcher */ |
|
| 116 | - $eventDispatcher = $serverContainer->get(EventDispatcherInterface::class); |
|
| 117 | - $this->consoleHooks($logger, $eventDispatcher); |
|
| 118 | - $this->appHooks($logger, $eventDispatcher); |
|
| 119 | - |
|
| 120 | - $this->sharingHooks($logger); |
|
| 121 | - |
|
| 122 | - $this->fileHooks($logger, $eventDispatcher); |
|
| 123 | - $this->trashbinHooks($logger); |
|
| 124 | - $this->versionsHooks($logger); |
|
| 125 | - |
|
| 126 | - $this->securityHooks($logger, $eventDispatcher); |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - private function userManagementHooks(ILogger $logger, |
|
| 130 | - IUserSession $userSession) { |
|
| 131 | - $userActions = new UserManagement($logger); |
|
| 132 | - |
|
| 133 | - Util::connectHook('OC_User', 'post_createUser', $userActions, 'create'); |
|
| 134 | - Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete'); |
|
| 135 | - Util::connectHook('OC_User', 'changeUser', $userActions, 'change'); |
|
| 136 | - |
|
| 137 | - $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']); |
|
| 138 | - $userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']); |
|
| 139 | - $userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']); |
|
| 140 | - } |
|
| 141 | - |
|
| 142 | - private function groupHooks(ILogger $logger, |
|
| 143 | - IGroupManager $groupManager) { |
|
| 144 | - $groupActions = new GroupManagement($logger); |
|
| 145 | - |
|
| 146 | - /** @var IGroupManager|Manager $groupManager */ |
|
| 147 | - $groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']); |
|
| 148 | - $groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']); |
|
| 149 | - $groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']); |
|
| 150 | - $groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']); |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - private function sharingHooks(ILogger $logger) { |
|
| 154 | - $shareActions = new Sharing($logger); |
|
| 155 | - |
|
| 156 | - Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared'); |
|
| 157 | - Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare'); |
|
| 158 | - Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare'); |
|
| 159 | - Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions'); |
|
| 160 | - Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword'); |
|
| 161 | - Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate'); |
|
| 162 | - Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed'); |
|
| 163 | - } |
|
| 164 | - |
|
| 165 | - private function authHooks(ILogger $logger) { |
|
| 166 | - $authActions = new Auth($logger); |
|
| 167 | - |
|
| 168 | - Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt'); |
|
| 169 | - Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful'); |
|
| 170 | - Util::connectHook('OC_User', 'logout', $authActions, 'logout'); |
|
| 171 | - } |
|
| 172 | - |
|
| 173 | - private function appHooks(ILogger $logger, |
|
| 174 | - EventDispatcherInterface $eventDispatcher) { |
|
| 175 | - $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) { |
|
| 176 | - $appActions = new AppManagement($logger); |
|
| 177 | - $appActions->enableApp($event->getAppID()); |
|
| 178 | - }); |
|
| 179 | - $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) { |
|
| 180 | - $appActions = new AppManagement($logger); |
|
| 181 | - $appActions->enableAppForGroups($event->getAppID(), $event->getGroups()); |
|
| 182 | - }); |
|
| 183 | - $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) { |
|
| 184 | - $appActions = new AppManagement($logger); |
|
| 185 | - $appActions->disableApp($event->getAppID()); |
|
| 186 | - }); |
|
| 187 | - } |
|
| 188 | - |
|
| 189 | - private function consoleHooks(ILogger $logger, |
|
| 190 | - EventDispatcherInterface $eventDispatcher) { |
|
| 191 | - $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) { |
|
| 192 | - $appActions = new Console($logger); |
|
| 193 | - $appActions->runCommand($event->getArguments()); |
|
| 194 | - }); |
|
| 195 | - } |
|
| 196 | - |
|
| 197 | - private function fileHooks(ILogger $logger, |
|
| 198 | - EventDispatcherInterface $eventDispatcher) { |
|
| 199 | - $fileActions = new Files($logger); |
|
| 200 | - $eventDispatcher->addListener( |
|
| 201 | - IPreview::EVENT, |
|
| 202 | - function (GenericEvent $event) use ($fileActions) { |
|
| 203 | - /** @var File $file */ |
|
| 204 | - $file = $event->getSubject(); |
|
| 205 | - $fileActions->preview([ |
|
| 206 | - 'path' => mb_substr($file->getInternalPath(), 5), |
|
| 207 | - 'width' => $event->getArguments()['width'], |
|
| 208 | - 'height' => $event->getArguments()['height'], |
|
| 209 | - 'crop' => $event->getArguments()['crop'], |
|
| 210 | - 'mode' => $event->getArguments()['mode'] |
|
| 211 | - ]); |
|
| 212 | - } |
|
| 213 | - ); |
|
| 214 | - |
|
| 215 | - Util::connectHook( |
|
| 216 | - Filesystem::CLASSNAME, |
|
| 217 | - Filesystem::signal_post_rename, |
|
| 218 | - $fileActions, |
|
| 219 | - 'rename' |
|
| 220 | - ); |
|
| 221 | - Util::connectHook( |
|
| 222 | - Filesystem::CLASSNAME, |
|
| 223 | - Filesystem::signal_post_create, |
|
| 224 | - $fileActions, |
|
| 225 | - 'create' |
|
| 226 | - ); |
|
| 227 | - Util::connectHook( |
|
| 228 | - Filesystem::CLASSNAME, |
|
| 229 | - Filesystem::signal_post_copy, |
|
| 230 | - $fileActions, |
|
| 231 | - 'copy' |
|
| 232 | - ); |
|
| 233 | - Util::connectHook( |
|
| 234 | - Filesystem::CLASSNAME, |
|
| 235 | - Filesystem::signal_post_write, |
|
| 236 | - $fileActions, |
|
| 237 | - 'write' |
|
| 238 | - ); |
|
| 239 | - Util::connectHook( |
|
| 240 | - Filesystem::CLASSNAME, |
|
| 241 | - Filesystem::signal_post_update, |
|
| 242 | - $fileActions, |
|
| 243 | - 'update' |
|
| 244 | - ); |
|
| 245 | - Util::connectHook( |
|
| 246 | - Filesystem::CLASSNAME, |
|
| 247 | - Filesystem::signal_read, |
|
| 248 | - $fileActions, |
|
| 249 | - 'read' |
|
| 250 | - ); |
|
| 251 | - Util::connectHook( |
|
| 252 | - Filesystem::CLASSNAME, |
|
| 253 | - Filesystem::signal_delete, |
|
| 254 | - $fileActions, |
|
| 255 | - 'delete' |
|
| 256 | - ); |
|
| 257 | - } |
|
| 258 | - |
|
| 259 | - private function versionsHooks(ILogger $logger) { |
|
| 260 | - $versionsActions = new Versions($logger); |
|
| 261 | - Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback'); |
|
| 262 | - Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete'); |
|
| 263 | - } |
|
| 264 | - |
|
| 265 | - private function trashbinHooks(ILogger $logger) { |
|
| 266 | - $trashActions = new Trashbin($logger); |
|
| 267 | - Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete'); |
|
| 268 | - Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore'); |
|
| 269 | - } |
|
| 270 | - |
|
| 271 | - private function securityHooks(ILogger $logger, |
|
| 272 | - EventDispatcherInterface $eventDispatcher) { |
|
| 273 | - $eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) { |
|
| 274 | - $security = new Security($logger); |
|
| 275 | - $security->twofactorSuccess($event->getSubject(), $event->getArguments()); |
|
| 276 | - }); |
|
| 277 | - $eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) { |
|
| 278 | - $security = new Security($logger); |
|
| 279 | - $security->twofactorFailed($event->getSubject(), $event->getArguments()); |
|
| 280 | - }); |
|
| 281 | - } |
|
| 91 | + $this->registerHooks($logger, $context->getServerContainer()); |
|
| 92 | + } |
|
| 93 | + |
|
| 94 | + private function getLogger(IConfig $config, |
|
| 95 | + ILogger $logger, |
|
| 96 | + ILogFactory $logFactory): ILogger { |
|
| 97 | + $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log'; |
|
| 98 | + $logFile = $config->getAppValue('admin_audit', 'logfile', $default); |
|
| 99 | + |
|
| 100 | + if ($logFile === null) { |
|
| 101 | + return $logger; |
|
| 102 | + } |
|
| 103 | + return $logFactory->getCustomLogger($logFile); |
|
| 104 | + } |
|
| 105 | + |
|
| 106 | + /** |
|
| 107 | + * Register hooks in order to log them |
|
| 108 | + */ |
|
| 109 | + private function registerHooks(ILogger $logger, |
|
| 110 | + IServerContainer $serverContainer) { |
|
| 111 | + $this->userManagementHooks($logger, $serverContainer->get(IUserSession::class)); |
|
| 112 | + $this->groupHooks($logger, $serverContainer->get(IGroupManager::class)); |
|
| 113 | + $this->authHooks($logger); |
|
| 114 | + |
|
| 115 | + /** @var EventDispatcherInterface $eventDispatcher */ |
|
| 116 | + $eventDispatcher = $serverContainer->get(EventDispatcherInterface::class); |
|
| 117 | + $this->consoleHooks($logger, $eventDispatcher); |
|
| 118 | + $this->appHooks($logger, $eventDispatcher); |
|
| 119 | + |
|
| 120 | + $this->sharingHooks($logger); |
|
| 121 | + |
|
| 122 | + $this->fileHooks($logger, $eventDispatcher); |
|
| 123 | + $this->trashbinHooks($logger); |
|
| 124 | + $this->versionsHooks($logger); |
|
| 125 | + |
|
| 126 | + $this->securityHooks($logger, $eventDispatcher); |
|
| 127 | + } |
|
| 128 | + |
|
| 129 | + private function userManagementHooks(ILogger $logger, |
|
| 130 | + IUserSession $userSession) { |
|
| 131 | + $userActions = new UserManagement($logger); |
|
| 132 | + |
|
| 133 | + Util::connectHook('OC_User', 'post_createUser', $userActions, 'create'); |
|
| 134 | + Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete'); |
|
| 135 | + Util::connectHook('OC_User', 'changeUser', $userActions, 'change'); |
|
| 136 | + |
|
| 137 | + $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']); |
|
| 138 | + $userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']); |
|
| 139 | + $userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']); |
|
| 140 | + } |
|
| 141 | + |
|
| 142 | + private function groupHooks(ILogger $logger, |
|
| 143 | + IGroupManager $groupManager) { |
|
| 144 | + $groupActions = new GroupManagement($logger); |
|
| 145 | + |
|
| 146 | + /** @var IGroupManager|Manager $groupManager */ |
|
| 147 | + $groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']); |
|
| 148 | + $groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']); |
|
| 149 | + $groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']); |
|
| 150 | + $groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']); |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + private function sharingHooks(ILogger $logger) { |
|
| 154 | + $shareActions = new Sharing($logger); |
|
| 155 | + |
|
| 156 | + Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared'); |
|
| 157 | + Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare'); |
|
| 158 | + Util::connectHook(Share::class, 'post_unshareFromSelf', $shareActions, 'unshare'); |
|
| 159 | + Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions'); |
|
| 160 | + Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword'); |
|
| 161 | + Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate'); |
|
| 162 | + Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed'); |
|
| 163 | + } |
|
| 164 | + |
|
| 165 | + private function authHooks(ILogger $logger) { |
|
| 166 | + $authActions = new Auth($logger); |
|
| 167 | + |
|
| 168 | + Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt'); |
|
| 169 | + Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful'); |
|
| 170 | + Util::connectHook('OC_User', 'logout', $authActions, 'logout'); |
|
| 171 | + } |
|
| 172 | + |
|
| 173 | + private function appHooks(ILogger $logger, |
|
| 174 | + EventDispatcherInterface $eventDispatcher) { |
|
| 175 | + $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) { |
|
| 176 | + $appActions = new AppManagement($logger); |
|
| 177 | + $appActions->enableApp($event->getAppID()); |
|
| 178 | + }); |
|
| 179 | + $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) { |
|
| 180 | + $appActions = new AppManagement($logger); |
|
| 181 | + $appActions->enableAppForGroups($event->getAppID(), $event->getGroups()); |
|
| 182 | + }); |
|
| 183 | + $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) { |
|
| 184 | + $appActions = new AppManagement($logger); |
|
| 185 | + $appActions->disableApp($event->getAppID()); |
|
| 186 | + }); |
|
| 187 | + } |
|
| 188 | + |
|
| 189 | + private function consoleHooks(ILogger $logger, |
|
| 190 | + EventDispatcherInterface $eventDispatcher) { |
|
| 191 | + $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) { |
|
| 192 | + $appActions = new Console($logger); |
|
| 193 | + $appActions->runCommand($event->getArguments()); |
|
| 194 | + }); |
|
| 195 | + } |
|
| 196 | + |
|
| 197 | + private function fileHooks(ILogger $logger, |
|
| 198 | + EventDispatcherInterface $eventDispatcher) { |
|
| 199 | + $fileActions = new Files($logger); |
|
| 200 | + $eventDispatcher->addListener( |
|
| 201 | + IPreview::EVENT, |
|
| 202 | + function (GenericEvent $event) use ($fileActions) { |
|
| 203 | + /** @var File $file */ |
|
| 204 | + $file = $event->getSubject(); |
|
| 205 | + $fileActions->preview([ |
|
| 206 | + 'path' => mb_substr($file->getInternalPath(), 5), |
|
| 207 | + 'width' => $event->getArguments()['width'], |
|
| 208 | + 'height' => $event->getArguments()['height'], |
|
| 209 | + 'crop' => $event->getArguments()['crop'], |
|
| 210 | + 'mode' => $event->getArguments()['mode'] |
|
| 211 | + ]); |
|
| 212 | + } |
|
| 213 | + ); |
|
| 214 | + |
|
| 215 | + Util::connectHook( |
|
| 216 | + Filesystem::CLASSNAME, |
|
| 217 | + Filesystem::signal_post_rename, |
|
| 218 | + $fileActions, |
|
| 219 | + 'rename' |
|
| 220 | + ); |
|
| 221 | + Util::connectHook( |
|
| 222 | + Filesystem::CLASSNAME, |
|
| 223 | + Filesystem::signal_post_create, |
|
| 224 | + $fileActions, |
|
| 225 | + 'create' |
|
| 226 | + ); |
|
| 227 | + Util::connectHook( |
|
| 228 | + Filesystem::CLASSNAME, |
|
| 229 | + Filesystem::signal_post_copy, |
|
| 230 | + $fileActions, |
|
| 231 | + 'copy' |
|
| 232 | + ); |
|
| 233 | + Util::connectHook( |
|
| 234 | + Filesystem::CLASSNAME, |
|
| 235 | + Filesystem::signal_post_write, |
|
| 236 | + $fileActions, |
|
| 237 | + 'write' |
|
| 238 | + ); |
|
| 239 | + Util::connectHook( |
|
| 240 | + Filesystem::CLASSNAME, |
|
| 241 | + Filesystem::signal_post_update, |
|
| 242 | + $fileActions, |
|
| 243 | + 'update' |
|
| 244 | + ); |
|
| 245 | + Util::connectHook( |
|
| 246 | + Filesystem::CLASSNAME, |
|
| 247 | + Filesystem::signal_read, |
|
| 248 | + $fileActions, |
|
| 249 | + 'read' |
|
| 250 | + ); |
|
| 251 | + Util::connectHook( |
|
| 252 | + Filesystem::CLASSNAME, |
|
| 253 | + Filesystem::signal_delete, |
|
| 254 | + $fileActions, |
|
| 255 | + 'delete' |
|
| 256 | + ); |
|
| 257 | + } |
|
| 258 | + |
|
| 259 | + private function versionsHooks(ILogger $logger) { |
|
| 260 | + $versionsActions = new Versions($logger); |
|
| 261 | + Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback'); |
|
| 262 | + Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete'); |
|
| 263 | + } |
|
| 264 | + |
|
| 265 | + private function trashbinHooks(ILogger $logger) { |
|
| 266 | + $trashActions = new Trashbin($logger); |
|
| 267 | + Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete'); |
|
| 268 | + Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore'); |
|
| 269 | + } |
|
| 270 | + |
|
| 271 | + private function securityHooks(ILogger $logger, |
|
| 272 | + EventDispatcherInterface $eventDispatcher) { |
|
| 273 | + $eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) { |
|
| 274 | + $security = new Security($logger); |
|
| 275 | + $security->twofactorSuccess($event->getSubject(), $event->getArguments()); |
|
| 276 | + }); |
|
| 277 | + $eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) { |
|
| 278 | + $security = new Security($logger); |
|
| 279 | + $security->twofactorFailed($event->getSubject(), $event->getArguments()); |
|
| 280 | + }); |
|
| 281 | + } |
|
| 282 | 282 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | private function getLogger(IConfig $config, |
| 95 | 95 | ILogger $logger, |
| 96 | 96 | ILogFactory $logFactory): ILogger { |
| 97 | - $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log'; |
|
| 97 | + $default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log'; |
|
| 98 | 98 | $logFile = $config->getAppValue('admin_audit', 'logfile', $default); |
| 99 | 99 | |
| 100 | 100 | if ($logFile === null) { |
@@ -172,15 +172,15 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | private function appHooks(ILogger $logger, |
| 174 | 174 | EventDispatcherInterface $eventDispatcher) { |
| 175 | - $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) { |
|
| 175 | + $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) use ($logger) { |
|
| 176 | 176 | $appActions = new AppManagement($logger); |
| 177 | 177 | $appActions->enableApp($event->getAppID()); |
| 178 | 178 | }); |
| 179 | - $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function (ManagerEvent $event) use ($logger) { |
|
| 179 | + $eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) use ($logger) { |
|
| 180 | 180 | $appActions = new AppManagement($logger); |
| 181 | 181 | $appActions->enableAppForGroups($event->getAppID(), $event->getGroups()); |
| 182 | 182 | }); |
| 183 | - $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function (ManagerEvent $event) use ($logger) { |
|
| 183 | + $eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) use ($logger) { |
|
| 184 | 184 | $appActions = new AppManagement($logger); |
| 185 | 185 | $appActions->disableApp($event->getAppID()); |
| 186 | 186 | }); |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | |
| 189 | 189 | private function consoleHooks(ILogger $logger, |
| 190 | 190 | EventDispatcherInterface $eventDispatcher) { |
| 191 | - $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) { |
|
| 191 | + $eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) use ($logger) { |
|
| 192 | 192 | $appActions = new Console($logger); |
| 193 | 193 | $appActions->runCommand($event->getArguments()); |
| 194 | 194 | }); |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | $fileActions = new Files($logger); |
| 200 | 200 | $eventDispatcher->addListener( |
| 201 | 201 | IPreview::EVENT, |
| 202 | - function (GenericEvent $event) use ($fileActions) { |
|
| 202 | + function(GenericEvent $event) use ($fileActions) { |
|
| 203 | 203 | /** @var File $file */ |
| 204 | 204 | $file = $event->getSubject(); |
| 205 | 205 | $fileActions->preview([ |
@@ -270,11 +270,11 @@ discard block |
||
| 270 | 270 | |
| 271 | 271 | private function securityHooks(ILogger $logger, |
| 272 | 272 | EventDispatcherInterface $eventDispatcher) { |
| 273 | - $eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) { |
|
| 273 | + $eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function(GenericEvent $event) use ($logger) { |
|
| 274 | 274 | $security = new Security($logger); |
| 275 | 275 | $security->twofactorSuccess($event->getSubject(), $event->getArguments()); |
| 276 | 276 | }); |
| 277 | - $eventDispatcher->addListener(IProvider::EVENT_FAILED, function (GenericEvent $event) use ($logger) { |
|
| 277 | + $eventDispatcher->addListener(IProvider::EVENT_FAILED, function(GenericEvent $event) use ($logger) { |
|
| 278 | 278 | $security = new Security($logger); |
| 279 | 279 | $security->twofactorFailed($event->getSubject(), $event->getArguments()); |
| 280 | 280 | }); |
@@ -46,40 +46,40 @@ |
||
| 46 | 46 | use OCP\Util; |
| 47 | 47 | |
| 48 | 48 | class Application extends App implements IBootstrap { |
| 49 | - public const APP_ID = 'twofactor_backupcodes'; |
|
| 49 | + public const APP_ID = 'twofactor_backupcodes'; |
|
| 50 | 50 | |
| 51 | - public function __construct() { |
|
| 52 | - parent::__construct(self::APP_ID); |
|
| 53 | - } |
|
| 51 | + public function __construct() { |
|
| 52 | + parent::__construct(self::APP_ID); |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - public function register(IRegistrationContext $context): void { |
|
| 56 | - $this->registerHooksAndEvents($context); |
|
| 57 | - } |
|
| 55 | + public function register(IRegistrationContext $context): void { |
|
| 56 | + $this->registerHooksAndEvents($context); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - public function boot(IBootContext $context): void { |
|
| 60 | - Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser'); |
|
| 59 | + public function boot(IBootContext $context): void { |
|
| 60 | + Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser'); |
|
| 61 | 61 | |
| 62 | - $context->injectFn(Closure::fromCallable([$this, 'registerNotification'])); |
|
| 63 | - } |
|
| 62 | + $context->injectFn(Closure::fromCallable([$this, 'registerNotification'])); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * Register the hooks and events |
|
| 67 | - */ |
|
| 68 | - public function registerHooksAndEvents(IRegistrationContext $context) { |
|
| 69 | - $context->registerEventListener(CodesGenerated::class, ActivityPublisher::class); |
|
| 70 | - $context->registerEventListener(CodesGenerated::class, RegistryUpdater::class); |
|
| 71 | - $context->registerEventListener(CodesGenerated::class, ClearNotifications::class); |
|
| 72 | - $context->registerEventListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class); |
|
| 73 | - $context->registerEventListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class); |
|
| 74 | - } |
|
| 65 | + /** |
|
| 66 | + * Register the hooks and events |
|
| 67 | + */ |
|
| 68 | + public function registerHooksAndEvents(IRegistrationContext $context) { |
|
| 69 | + $context->registerEventListener(CodesGenerated::class, ActivityPublisher::class); |
|
| 70 | + $context->registerEventListener(CodesGenerated::class, RegistryUpdater::class); |
|
| 71 | + $context->registerEventListener(CodesGenerated::class, ClearNotifications::class); |
|
| 72 | + $context->registerEventListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class); |
|
| 73 | + $context->registerEventListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class); |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - private function registerNotification(IManager $manager) { |
|
| 77 | - $manager->registerNotifierService(Notifier::class); |
|
| 78 | - } |
|
| 76 | + private function registerNotification(IManager $manager) { |
|
| 77 | + $manager->registerNotifierService(Notifier::class); |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - public function deleteUser($params) { |
|
| 81 | - /** @var BackupCodeMapper $mapper */ |
|
| 82 | - $mapper = $this->getContainer()->query(BackupCodeMapper::class); |
|
| 83 | - $mapper->deleteCodesByUserId($params['uid']); |
|
| 84 | - } |
|
| 80 | + public function deleteUser($params) { |
|
| 81 | + /** @var BackupCodeMapper $mapper */ |
|
| 82 | + $mapper = $this->getContainer()->query(BackupCodeMapper::class); |
|
| 83 | + $mapper->deleteCodesByUserId($params['uid']); |
|
| 84 | + } |
|
| 85 | 85 | } |
@@ -60,120 +60,120 @@ |
||
| 60 | 60 | use OCP\Util; |
| 61 | 61 | |
| 62 | 62 | class Application extends App implements IBootstrap { |
| 63 | - public const APP_ID = 'files'; |
|
| 64 | - |
|
| 65 | - public function __construct(array $urlParams=[]) { |
|
| 66 | - parent::__construct(self::APP_ID, $urlParams); |
|
| 67 | - } |
|
| 68 | - |
|
| 69 | - public function register(IRegistrationContext $context): void { |
|
| 70 | - /** |
|
| 71 | - * Controllers |
|
| 72 | - */ |
|
| 73 | - $context->registerService('APIController', function (IContainer $c) { |
|
| 74 | - /** @var IServerContainer $server */ |
|
| 75 | - $server = $c->query(IServerContainer::class); |
|
| 76 | - |
|
| 77 | - return new ApiController( |
|
| 78 | - $c->query('AppName'), |
|
| 79 | - $c->query('Request'), |
|
| 80 | - $server->getUserSession(), |
|
| 81 | - $c->query('TagService'), |
|
| 82 | - $server->getPreviewManager(), |
|
| 83 | - $server->getShareManager(), |
|
| 84 | - $server->getConfig(), |
|
| 85 | - $server->getUserFolder() |
|
| 86 | - ); |
|
| 87 | - }); |
|
| 88 | - |
|
| 89 | - /** |
|
| 90 | - * Services |
|
| 91 | - */ |
|
| 92 | - $context->registerService('TagService', function (IContainer $c) { |
|
| 93 | - /** @var IServerContainer $server */ |
|
| 94 | - $server = $c->query(IServerContainer::class); |
|
| 95 | - |
|
| 96 | - return new TagService( |
|
| 97 | - $server->getUserSession(), |
|
| 98 | - $server->getActivityManager(), |
|
| 99 | - $server->getTagManager()->load(self::APP_ID), |
|
| 100 | - $server->getUserFolder(), |
|
| 101 | - $server->getEventDispatcher() |
|
| 102 | - ); |
|
| 103 | - }); |
|
| 104 | - |
|
| 105 | - /* |
|
| 63 | + public const APP_ID = 'files'; |
|
| 64 | + |
|
| 65 | + public function __construct(array $urlParams=[]) { |
|
| 66 | + parent::__construct(self::APP_ID, $urlParams); |
|
| 67 | + } |
|
| 68 | + |
|
| 69 | + public function register(IRegistrationContext $context): void { |
|
| 70 | + /** |
|
| 71 | + * Controllers |
|
| 72 | + */ |
|
| 73 | + $context->registerService('APIController', function (IContainer $c) { |
|
| 74 | + /** @var IServerContainer $server */ |
|
| 75 | + $server = $c->query(IServerContainer::class); |
|
| 76 | + |
|
| 77 | + return new ApiController( |
|
| 78 | + $c->query('AppName'), |
|
| 79 | + $c->query('Request'), |
|
| 80 | + $server->getUserSession(), |
|
| 81 | + $c->query('TagService'), |
|
| 82 | + $server->getPreviewManager(), |
|
| 83 | + $server->getShareManager(), |
|
| 84 | + $server->getConfig(), |
|
| 85 | + $server->getUserFolder() |
|
| 86 | + ); |
|
| 87 | + }); |
|
| 88 | + |
|
| 89 | + /** |
|
| 90 | + * Services |
|
| 91 | + */ |
|
| 92 | + $context->registerService('TagService', function (IContainer $c) { |
|
| 93 | + /** @var IServerContainer $server */ |
|
| 94 | + $server = $c->query(IServerContainer::class); |
|
| 95 | + |
|
| 96 | + return new TagService( |
|
| 97 | + $server->getUserSession(), |
|
| 98 | + $server->getActivityManager(), |
|
| 99 | + $server->getTagManager()->load(self::APP_ID), |
|
| 100 | + $server->getUserFolder(), |
|
| 101 | + $server->getEventDispatcher() |
|
| 102 | + ); |
|
| 103 | + }); |
|
| 104 | + |
|
| 105 | + /* |
|
| 106 | 106 | * Register capabilities |
| 107 | 107 | */ |
| 108 | - $context->registerCapability(Capabilities::class); |
|
| 109 | - |
|
| 110 | - $context->registerEventListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class); |
|
| 111 | - $context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class); |
|
| 112 | - |
|
| 113 | - $context->registerSearchProvider(FilesSearchProvider::class); |
|
| 114 | - } |
|
| 115 | - |
|
| 116 | - public function boot(IBootContext $context): void { |
|
| 117 | - $context->injectFn(Closure::fromCallable([$this, 'registerCollaboration'])); |
|
| 118 | - $context->injectFn([Listener::class, 'register']); |
|
| 119 | - $context->injectFn(Closure::fromCallable([$this, 'registerNotification'])); |
|
| 120 | - $context->injectFn(Closure::fromCallable([$this, 'registerSearchProvider'])); |
|
| 121 | - $this->registerTemplates(); |
|
| 122 | - $context->injectFn(Closure::fromCallable([$this, 'registerNavigation'])); |
|
| 123 | - $this->registerHooks(); |
|
| 124 | - } |
|
| 125 | - |
|
| 126 | - private function registerCollaboration(IProviderManager $providerManager): void { |
|
| 127 | - $providerManager->registerResourceProvider(ResourceProvider::class); |
|
| 128 | - } |
|
| 129 | - |
|
| 130 | - private function registerNotification(IManager $notifications): void { |
|
| 131 | - $notifications->registerNotifierService(Notifier::class); |
|
| 132 | - } |
|
| 133 | - |
|
| 134 | - private function registerSearchProvider(ISearch $search): void { |
|
| 135 | - $search->registerProvider(File::class, ['apps' => ['files']]); |
|
| 136 | - } |
|
| 137 | - |
|
| 138 | - private function registerTemplates(): void { |
|
| 139 | - $templateManager = \OC_Helper::getFileTemplateManager(); |
|
| 140 | - $templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp'); |
|
| 141 | - $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt'); |
|
| 142 | - $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods'); |
|
| 143 | - } |
|
| 144 | - |
|
| 145 | - private function registerNavigation(IL10N $l10n): void { |
|
| 146 | - \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 147 | - return [ |
|
| 148 | - 'id' => 'files', |
|
| 149 | - 'appname' => 'files', |
|
| 150 | - 'script' => 'list.php', |
|
| 151 | - 'order' => 0, |
|
| 152 | - 'name' => $l10n->t('All files') |
|
| 153 | - ]; |
|
| 154 | - }); |
|
| 155 | - \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 156 | - return [ |
|
| 157 | - 'id' => 'recent', |
|
| 158 | - 'appname' => 'files', |
|
| 159 | - 'script' => 'recentlist.php', |
|
| 160 | - 'order' => 2, |
|
| 161 | - 'name' => $l10n->t('Recent') |
|
| 162 | - ]; |
|
| 163 | - }); |
|
| 164 | - \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 165 | - return [ |
|
| 166 | - 'id' => 'favorites', |
|
| 167 | - 'appname' => 'files', |
|
| 168 | - 'script' => 'simplelist.php', |
|
| 169 | - 'order' => 5, |
|
| 170 | - 'name' => $l10n->t('Favorites'), |
|
| 171 | - 'expandedState' => 'show_Quick_Access' |
|
| 172 | - ]; |
|
| 173 | - }); |
|
| 174 | - } |
|
| 175 | - |
|
| 176 | - private function registerHooks(): void { |
|
| 177 | - Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig'); |
|
| 178 | - } |
|
| 108 | + $context->registerCapability(Capabilities::class); |
|
| 109 | + |
|
| 110 | + $context->registerEventListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class); |
|
| 111 | + $context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class); |
|
| 112 | + |
|
| 113 | + $context->registerSearchProvider(FilesSearchProvider::class); |
|
| 114 | + } |
|
| 115 | + |
|
| 116 | + public function boot(IBootContext $context): void { |
|
| 117 | + $context->injectFn(Closure::fromCallable([$this, 'registerCollaboration'])); |
|
| 118 | + $context->injectFn([Listener::class, 'register']); |
|
| 119 | + $context->injectFn(Closure::fromCallable([$this, 'registerNotification'])); |
|
| 120 | + $context->injectFn(Closure::fromCallable([$this, 'registerSearchProvider'])); |
|
| 121 | + $this->registerTemplates(); |
|
| 122 | + $context->injectFn(Closure::fromCallable([$this, 'registerNavigation'])); |
|
| 123 | + $this->registerHooks(); |
|
| 124 | + } |
|
| 125 | + |
|
| 126 | + private function registerCollaboration(IProviderManager $providerManager): void { |
|
| 127 | + $providerManager->registerResourceProvider(ResourceProvider::class); |
|
| 128 | + } |
|
| 129 | + |
|
| 130 | + private function registerNotification(IManager $notifications): void { |
|
| 131 | + $notifications->registerNotifierService(Notifier::class); |
|
| 132 | + } |
|
| 133 | + |
|
| 134 | + private function registerSearchProvider(ISearch $search): void { |
|
| 135 | + $search->registerProvider(File::class, ['apps' => ['files']]); |
|
| 136 | + } |
|
| 137 | + |
|
| 138 | + private function registerTemplates(): void { |
|
| 139 | + $templateManager = \OC_Helper::getFileTemplateManager(); |
|
| 140 | + $templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp'); |
|
| 141 | + $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt'); |
|
| 142 | + $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods'); |
|
| 143 | + } |
|
| 144 | + |
|
| 145 | + private function registerNavigation(IL10N $l10n): void { |
|
| 146 | + \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 147 | + return [ |
|
| 148 | + 'id' => 'files', |
|
| 149 | + 'appname' => 'files', |
|
| 150 | + 'script' => 'list.php', |
|
| 151 | + 'order' => 0, |
|
| 152 | + 'name' => $l10n->t('All files') |
|
| 153 | + ]; |
|
| 154 | + }); |
|
| 155 | + \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 156 | + return [ |
|
| 157 | + 'id' => 'recent', |
|
| 158 | + 'appname' => 'files', |
|
| 159 | + 'script' => 'recentlist.php', |
|
| 160 | + 'order' => 2, |
|
| 161 | + 'name' => $l10n->t('Recent') |
|
| 162 | + ]; |
|
| 163 | + }); |
|
| 164 | + \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 165 | + return [ |
|
| 166 | + 'id' => 'favorites', |
|
| 167 | + 'appname' => 'files', |
|
| 168 | + 'script' => 'simplelist.php', |
|
| 169 | + 'order' => 5, |
|
| 170 | + 'name' => $l10n->t('Favorites'), |
|
| 171 | + 'expandedState' => 'show_Quick_Access' |
|
| 172 | + ]; |
|
| 173 | + }); |
|
| 174 | + } |
|
| 175 | + |
|
| 176 | + private function registerHooks(): void { |
|
| 177 | + Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig'); |
|
| 178 | + } |
|
| 179 | 179 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | class Application extends App implements IBootstrap { |
| 63 | 63 | public const APP_ID = 'files'; |
| 64 | 64 | |
| 65 | - public function __construct(array $urlParams=[]) { |
|
| 65 | + public function __construct(array $urlParams = []) { |
|
| 66 | 66 | parent::__construct(self::APP_ID, $urlParams); |
| 67 | 67 | } |
| 68 | 68 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | /** |
| 71 | 71 | * Controllers |
| 72 | 72 | */ |
| 73 | - $context->registerService('APIController', function (IContainer $c) { |
|
| 73 | + $context->registerService('APIController', function(IContainer $c) { |
|
| 74 | 74 | /** @var IServerContainer $server */ |
| 75 | 75 | $server = $c->query(IServerContainer::class); |
| 76 | 76 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | /** |
| 90 | 90 | * Services |
| 91 | 91 | */ |
| 92 | - $context->registerService('TagService', function (IContainer $c) { |
|
| 92 | + $context->registerService('TagService', function(IContainer $c) { |
|
| 93 | 93 | /** @var IServerContainer $server */ |
| 94 | 94 | $server = $c->query(IServerContainer::class); |
| 95 | 95 | |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | private function registerNavigation(IL10N $l10n): void { |
| 146 | - \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 146 | + \OCA\Files\App::getNavigationManager()->add(function() use ($l10n) { |
|
| 147 | 147 | return [ |
| 148 | 148 | 'id' => 'files', |
| 149 | 149 | 'appname' => 'files', |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | 'name' => $l10n->t('All files') |
| 153 | 153 | ]; |
| 154 | 154 | }); |
| 155 | - \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 155 | + \OCA\Files\App::getNavigationManager()->add(function() use ($l10n) { |
|
| 156 | 156 | return [ |
| 157 | 157 | 'id' => 'recent', |
| 158 | 158 | 'appname' => 'files', |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | 'name' => $l10n->t('Recent') |
| 162 | 162 | ]; |
| 163 | 163 | }); |
| 164 | - \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) { |
|
| 164 | + \OCA\Files\App::getNavigationManager()->add(function() use ($l10n) { |
|
| 165 | 165 | return [ |
| 166 | 166 | 'id' => 'favorites', |
| 167 | 167 | 'appname' => 'files', |
@@ -46,49 +46,49 @@ |
||
| 46 | 46 | use OCP\Util; |
| 47 | 47 | |
| 48 | 48 | class Application extends App implements IBootstrap { |
| 49 | - public function __construct() { |
|
| 50 | - parent::__construct('updatenotification', []); |
|
| 51 | - } |
|
| 49 | + public function __construct() { |
|
| 50 | + parent::__construct('updatenotification', []); |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - public function register(IRegistrationContext $context): void { |
|
| 54 | - } |
|
| 53 | + public function register(IRegistrationContext $context): void { |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - public function boot(IBootContext $context): void { |
|
| 57 | - $context->injectFn(function (IConfig $config, |
|
| 58 | - INotificationManager $notificationsManager, |
|
| 59 | - IUserSession $userSession, |
|
| 60 | - IAppManager $appManager, |
|
| 61 | - IGroupManager $groupManager, |
|
| 62 | - IAppContainer $appContainer, |
|
| 63 | - ILogger $logger) { |
|
| 64 | - if ($config->getSystemValue('updatechecker', true) !== true) { |
|
| 65 | - // Updater check is disabled |
|
| 66 | - return; |
|
| 67 | - } |
|
| 56 | + public function boot(IBootContext $context): void { |
|
| 57 | + $context->injectFn(function (IConfig $config, |
|
| 58 | + INotificationManager $notificationsManager, |
|
| 59 | + IUserSession $userSession, |
|
| 60 | + IAppManager $appManager, |
|
| 61 | + IGroupManager $groupManager, |
|
| 62 | + IAppContainer $appContainer, |
|
| 63 | + ILogger $logger) { |
|
| 64 | + if ($config->getSystemValue('updatechecker', true) !== true) { |
|
| 65 | + // Updater check is disabled |
|
| 66 | + return; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - // Always register the notifier, so background jobs (without a user) can send push notifications |
|
| 70 | - $notificationsManager->registerNotifierService(Notifier::class); |
|
| 69 | + // Always register the notifier, so background jobs (without a user) can send push notifications |
|
| 70 | + $notificationsManager->registerNotifierService(Notifier::class); |
|
| 71 | 71 | |
| 72 | - $user = $userSession->getUser(); |
|
| 73 | - if (!$user instanceof IUser) { |
|
| 74 | - // Nothing to do for guests |
|
| 75 | - return; |
|
| 76 | - } |
|
| 72 | + $user = $userSession->getUser(); |
|
| 73 | + if (!$user instanceof IUser) { |
|
| 74 | + // Nothing to do for guests |
|
| 75 | + return; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - if (!$appManager->isEnabledForUser('notifications') && |
|
| 79 | - $groupManager->isAdmin($user->getUID())) { |
|
| 80 | - try { |
|
| 81 | - $updateChecker = $appContainer->get(UpdateChecker::class); |
|
| 82 | - } catch (QueryException $e) { |
|
| 83 | - $logger->logException($e); |
|
| 84 | - return; |
|
| 85 | - } |
|
| 78 | + if (!$appManager->isEnabledForUser('notifications') && |
|
| 79 | + $groupManager->isAdmin($user->getUID())) { |
|
| 80 | + try { |
|
| 81 | + $updateChecker = $appContainer->get(UpdateChecker::class); |
|
| 82 | + } catch (QueryException $e) { |
|
| 83 | + $logger->logException($e); |
|
| 84 | + return; |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | - if ($updateChecker->getUpdateState() !== []) { |
|
| 88 | - Util::addScript('updatenotification', 'legacy-notification'); |
|
| 89 | - \OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'populateJavaScriptVariables'); |
|
| 90 | - } |
|
| 91 | - } |
|
| 92 | - }); |
|
| 93 | - } |
|
| 87 | + if ($updateChecker->getUpdateState() !== []) { |
|
| 88 | + Util::addScript('updatenotification', 'legacy-notification'); |
|
| 89 | + \OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'populateJavaScriptVariables'); |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | + }); |
|
| 93 | + } |
|
| 94 | 94 | } |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | public function boot(IBootContext $context): void { |
| 57 | - $context->injectFn(function (IConfig $config, |
|
| 57 | + $context->injectFn(function(IConfig $config, |
|
| 58 | 58 | INotificationManager $notificationsManager, |
| 59 | 59 | IUserSession $userSession, |
| 60 | 60 | IAppManager $appManager, |
@@ -26,19 +26,19 @@ |
||
| 26 | 26 | use OCP\IConfig; |
| 27 | 27 | |
| 28 | 28 | class JSSettingsHelper { |
| 29 | - /** @var IConfig */ |
|
| 30 | - private $c; |
|
| 29 | + /** @var IConfig */ |
|
| 30 | + private $c; |
|
| 31 | 31 | |
| 32 | - public function __construct(IConfig $c) { |
|
| 33 | - $this->c = $c; |
|
| 34 | - } |
|
| 32 | + public function __construct(IConfig $c) { |
|
| 33 | + $this->c = $c; |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - public function extend(array $settings) { |
|
| 37 | - $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
|
| 36 | + public function extend(array $settings) { |
|
| 37 | + $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
|
| 38 | 38 | |
| 39 | - $value = (int)$this->c->getAppValue('comments', 'maxAutoCompleteResults', 10); |
|
| 40 | - $appConfig['comments']['maxAutoCompleteResults'] = $value; |
|
| 39 | + $value = (int)$this->c->getAppValue('comments', 'maxAutoCompleteResults', 10); |
|
| 40 | + $appConfig['comments']['maxAutoCompleteResults'] = $value; |
|
| 41 | 41 | |
| 42 | - $settings['array']['oc_appconfig'] = json_encode($appConfig); |
|
| 43 | - } |
|
| 42 | + $settings['array']['oc_appconfig'] = json_encode($appConfig); |
|
| 43 | + } |
|
| 44 | 44 | } |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | public function extend(array $settings) { |
| 37 | 37 | $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
| 38 | 38 | |
| 39 | - $value = (int)$this->c->getAppValue('comments', 'maxAutoCompleteResults', 10); |
|
| 39 | + $value = (int) $this->c->getAppValue('comments', 'maxAutoCompleteResults', 10); |
|
| 40 | 40 | $appConfig['comments']['maxAutoCompleteResults'] = $value; |
| 41 | 41 | |
| 42 | 42 | $settings['array']['oc_appconfig'] = json_encode($appConfig); |
@@ -51,49 +51,49 @@ |
||
| 51 | 51 | use OCP\Util; |
| 52 | 52 | |
| 53 | 53 | class Application extends App implements IBootstrap { |
| 54 | - public const APP_ID = 'comments'; |
|
| 54 | + public const APP_ID = 'comments'; |
|
| 55 | 55 | |
| 56 | - public function __construct(array $urlParams = []) { |
|
| 57 | - parent::__construct(self::APP_ID, $urlParams); |
|
| 58 | - } |
|
| 56 | + public function __construct(array $urlParams = []) { |
|
| 57 | + parent::__construct(self::APP_ID, $urlParams); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - public function register(IRegistrationContext $context): void { |
|
| 61 | - $context->registerCapability(Capabilities::class); |
|
| 60 | + public function register(IRegistrationContext $context): void { |
|
| 61 | + $context->registerCapability(Capabilities::class); |
|
| 62 | 62 | |
| 63 | - $context->registerServiceAlias('NotificationsController', Notifications::class); |
|
| 63 | + $context->registerServiceAlias('NotificationsController', Notifications::class); |
|
| 64 | 64 | |
| 65 | - $context->registerEventListener( |
|
| 66 | - LoadAdditionalScriptsEvent::class, |
|
| 67 | - LoadAdditionalScripts::class |
|
| 68 | - ); |
|
| 69 | - $context->registerEventListener( |
|
| 70 | - LoadSidebar::class, |
|
| 71 | - LoadSidebarScripts::class |
|
| 72 | - ); |
|
| 73 | - $context->registerEventListener( |
|
| 74 | - CommentsEntityEvent::EVENT_ENTITY, |
|
| 75 | - CommentsEntityEventListener::class |
|
| 76 | - ); |
|
| 77 | - $context->registerSearchProvider(Provider::class); |
|
| 78 | - } |
|
| 65 | + $context->registerEventListener( |
|
| 66 | + LoadAdditionalScriptsEvent::class, |
|
| 67 | + LoadAdditionalScripts::class |
|
| 68 | + ); |
|
| 69 | + $context->registerEventListener( |
|
| 70 | + LoadSidebar::class, |
|
| 71 | + LoadSidebarScripts::class |
|
| 72 | + ); |
|
| 73 | + $context->registerEventListener( |
|
| 74 | + CommentsEntityEvent::EVENT_ENTITY, |
|
| 75 | + CommentsEntityEventListener::class |
|
| 76 | + ); |
|
| 77 | + $context->registerSearchProvider(Provider::class); |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - public function boot(IBootContext $context): void { |
|
| 81 | - $context->injectFn(Closure::fromCallable([$this, 'registerNotifier'])); |
|
| 82 | - $context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler'])); |
|
| 80 | + public function boot(IBootContext $context): void { |
|
| 81 | + $context->injectFn(Closure::fromCallable([$this, 'registerNotifier'])); |
|
| 82 | + $context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler'])); |
|
| 83 | 83 | |
| 84 | - $jsSettingsHelper = new JSSettingsHelper($context->getAppContainer()->get(IConfig::class)); |
|
| 85 | - Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend'); |
|
| 84 | + $jsSettingsHelper = new JSSettingsHelper($context->getAppContainer()->get(IConfig::class)); |
|
| 85 | + Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend'); |
|
| 86 | 86 | |
| 87 | - $context->getServerContainer()->get(ISearch::class)->registerProvider(LegacyProvider::class, ['apps' => ['files']]); |
|
| 88 | - } |
|
| 87 | + $context->getServerContainer()->get(ISearch::class)->registerProvider(LegacyProvider::class, ['apps' => ['files']]); |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - protected function registerNotifier(IServerContainer $container) { |
|
| 91 | - $container->getNotificationManager()->registerNotifierService(Notifier::class); |
|
| 92 | - } |
|
| 90 | + protected function registerNotifier(IServerContainer $container) { |
|
| 91 | + $container->getNotificationManager()->registerNotifierService(Notifier::class); |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - protected function registerCommentsEventHandler(IServerContainer $container) { |
|
| 95 | - $container->getCommentsManager()->registerEventHandler(function () { |
|
| 96 | - return $this->getContainer()->query(EventHandler::class); |
|
| 97 | - }); |
|
| 98 | - } |
|
| 94 | + protected function registerCommentsEventHandler(IServerContainer $container) { |
|
| 95 | + $container->getCommentsManager()->registerEventHandler(function () { |
|
| 96 | + return $this->getContainer()->query(EventHandler::class); |
|
| 97 | + }); |
|
| 98 | + } |
|
| 99 | 99 | } |