nextcloud / server

apps/comments/lib/Listener/LoadAdditionalScripts.php

Indentation +8 added lines, -8 removed lines

@@ -34,14 +34,14 @@
 use OCP\Util;
 
 class LoadAdditionalScripts implements IEventListener {
-	public function handle(Event $event): void {
-		if (!($event instanceof LoadAdditionalScriptsEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof LoadAdditionalScriptsEvent)) {
+            return;
+        }
 
-		// TODO: make sure to only include the sidebar script when
-		// we properly split it between files list and sidebar
-		Util::addScript(Application::APP_ID, 'comments');
-	}
+        // TODO: make sure to only include the sidebar script when
+        // we properly split it between files list and sidebar
+        Util::addScript(Application::APP_ID, 'comments');
+    }
 
 }

apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 		$httpClient = $this->clientService->newClient();
 
 		try {
-			$response = $httpClient->post($remote . '/index.php/apps/federatedfilesharing/createFederatedShare',
+			$response = $httpClient->post($remote.'/index.php/apps/federatedfilesharing/createFederatedShare',
 				[
 					'body' =>
 						[

Indentation +184 added lines, -184 removed lines

@@ -57,188 +57,188 @@
  */
 class MountPublicLinkController extends Controller {
 
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	/** @var AddressHandler */
-	private $addressHandler;
-
-	/** @var IManager  */
-	private $shareManager;
-
-	/** @var  ISession */
-	private $session;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IClientService */
-	private $clientService;
-
-	/** @var ICloudIdManager  */
-	private $cloudIdManager;
-
-	/**
-	 * MountPublicLinkController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param FederatedShareProvider $federatedShareProvider
-	 * @param IManager $shareManager
-	 * @param AddressHandler $addressHandler
-	 * @param ISession $session
-	 * @param IL10N $l
-	 * @param IUserSession $userSession
-	 * @param IClientService $clientService
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								FederatedShareProvider $federatedShareProvider,
-								IManager $shareManager,
-								AddressHandler $addressHandler,
-								ISession $session,
-								IL10N $l,
-								IUserSession $userSession,
-								IClientService $clientService,
-								ICloudIdManager $cloudIdManager
-	) {
-		parent::__construct($appName, $request);
-
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->shareManager = $shareManager;
-		$this->addressHandler = $addressHandler;
-		$this->session = $session;
-		$this->l = $l;
-		$this->userSession = $userSession;
-		$this->clientService = $clientService;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * send federated share to a user of a public link
-	 *
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @BruteForceProtection(action=publicLink2FederatedShare)
-	 *
-	 * @param string $shareWith
-	 * @param string $token
-	 * @param string $password
-	 * @return JSONResponse
-	 */
-	public function createFederatedShare($shareWith, $token, $password = '') {
-		if (!$this->federatedShareProvider->isOutgoingServer2serverShareEnabled()) {
-			return new JSONResponse(
-				['message' => 'This server doesn\'t support outgoing federated shares'],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		try {
-			[, $server] = $this->addressHandler->splitUserRemote($shareWith);
-			$share = $this->shareManager->getShareByToken($token);
-		} catch (HintException $e) {
-			$response = new JSONResponse(['message' => $e->getHint()], Http::STATUS_BAD_REQUEST);
-			$response->throttle();
-			return $response;
-		}
-
-		// make sure that user is authenticated in case of a password protected link
-		$storedPassword = $share->getPassword();
-		$authenticated = $this->session->get('public_link_authenticated') === $share->getId() ||
-			$this->shareManager->checkPassword($share, $password);
-		if (!empty($storedPassword) && !$authenticated) {
-			$response = new JSONResponse(
-				['message' => 'No permission to access the share'],
-				Http::STATUS_BAD_REQUEST
-			);
-			$response->throttle();
-			return $response;
-		}
-
-		if (($share->getPermissions() & Constants::PERMISSION_READ) === 0) {
-			$response = new JSONResponse(
-				['message' => 'Mounting file drop not supported'],
-				Http::STATUS_BAD_REQUEST
-			);
-			$response->throttle();
-			return $response;
-		}
-
-		$share->setSharedWith($shareWith);
-		$share->setShareType(IShare::TYPE_REMOTE);
-
-		try {
-			$this->federatedShareProvider->create($share);
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'level' => ILogger::WARN,
-				'app' => 'federatedfilesharing',
-			]);
-			return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
-		}
-
-		return new JSONResponse(['remoteUrl' => $server]);
-	}
-
-	/**
-	 * ask other server to get a federated share
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $token
-	 * @param string $remote
-	 * @param string $password
-	 * @param string $owner (only for legacy reasons, can be removed with legacyMountPublicLink())
-	 * @param string $ownerDisplayName (only for legacy reasons, can be removed with legacyMountPublicLink())
-	 * @param string $name (only for legacy reasons, can be removed with legacyMountPublicLink())
-	 * @return JSONResponse
-	 */
-	public function askForFederatedShare($token, $remote, $password = '', $owner = '', $ownerDisplayName = '', $name = '') {
-		// check if server admin allows to mount public links from other servers
-		if ($this->federatedShareProvider->isIncomingServer2serverShareEnabled() === false) {
-			return new JSONResponse(['message' => $this->l->t('Server to server sharing is not enabled on this server')], Http::STATUS_BAD_REQUEST);
-		}
-
-		$cloudId = $this->cloudIdManager->getCloudId($this->userSession->getUser()->getUID(), $this->addressHandler->generateRemoteURL());
-
-		$httpClient = $this->clientService->newClient();
-
-		try {
-			$response = $httpClient->post($remote . '/index.php/apps/federatedfilesharing/createFederatedShare',
-				[
-					'body' =>
-						[
-							'token' => $token,
-							'shareWith' => rtrim($cloudId->getId(), '/'),
-							'password' => $password
-						],
-					'connect_timeout' => 10,
-				]
-			);
-		} catch (\Exception $e) {
-			if (empty($password)) {
-				$message = $this->l->t("Couldn't establish a federated share.");
-			} else {
-				$message = $this->l->t("Couldn't establish a federated share, maybe the password was wrong.");
-			}
-			return new JSONResponse(['message' => $message], Http::STATUS_BAD_REQUEST);
-		}
-
-		$body = $response->getBody();
-		$result = json_decode($body, true);
-
-		if (is_array($result) && isset($result['remoteUrl'])) {
-			return new JSONResponse(['message' => $this->l->t('Federated Share request sent, you will receive an invitation. Check your notifications.')]);
-		}
-
-		// if we doesn't get the expected response we assume that we try to add
-		// a federated share from a Nextcloud <= 9 server
-		$message = $this->l->t("Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9).");
-		return new JSONResponse(['message' => $message], Http::STATUS_BAD_REQUEST);
-	}
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+
+    /** @var AddressHandler */
+    private $addressHandler;
+
+    /** @var IManager  */
+    private $shareManager;
+
+    /** @var  ISession */
+    private $session;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IClientService */
+    private $clientService;
+
+    /** @var ICloudIdManager  */
+    private $cloudIdManager;
+
+    /**
+     * MountPublicLinkController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param FederatedShareProvider $federatedShareProvider
+     * @param IManager $shareManager
+     * @param AddressHandler $addressHandler
+     * @param ISession $session
+     * @param IL10N $l
+     * @param IUserSession $userSession
+     * @param IClientService $clientService
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                FederatedShareProvider $federatedShareProvider,
+                                IManager $shareManager,
+                                AddressHandler $addressHandler,
+                                ISession $session,
+                                IL10N $l,
+                                IUserSession $userSession,
+                                IClientService $clientService,
+                                ICloudIdManager $cloudIdManager
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->shareManager = $shareManager;
+        $this->addressHandler = $addressHandler;
+        $this->session = $session;
+        $this->l = $l;
+        $this->userSession = $userSession;
+        $this->clientService = $clientService;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * send federated share to a user of a public link
+     *
+     * @NoCSRFRequired
+     * @PublicPage
+     * @BruteForceProtection(action=publicLink2FederatedShare)
+     *
+     * @param string $shareWith
+     * @param string $token
+     * @param string $password
+     * @return JSONResponse
+     */
+    public function createFederatedShare($shareWith, $token, $password = '') {
+        if (!$this->federatedShareProvider->isOutgoingServer2serverShareEnabled()) {
+            return new JSONResponse(
+                ['message' => 'This server doesn\'t support outgoing federated shares'],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
+
+        try {
+            [, $server] = $this->addressHandler->splitUserRemote($shareWith);
+            $share = $this->shareManager->getShareByToken($token);
+        } catch (HintException $e) {
+            $response = new JSONResponse(['message' => $e->getHint()], Http::STATUS_BAD_REQUEST);
+            $response->throttle();
+            return $response;
+        }
+
+        // make sure that user is authenticated in case of a password protected link
+        $storedPassword = $share->getPassword();
+        $authenticated = $this->session->get('public_link_authenticated') === $share->getId() ||
+            $this->shareManager->checkPassword($share, $password);
+        if (!empty($storedPassword) && !$authenticated) {
+            $response = new JSONResponse(
+                ['message' => 'No permission to access the share'],
+                Http::STATUS_BAD_REQUEST
+            );
+            $response->throttle();
+            return $response;
+        }
+
+        if (($share->getPermissions() & Constants::PERMISSION_READ) === 0) {
+            $response = new JSONResponse(
+                ['message' => 'Mounting file drop not supported'],
+                Http::STATUS_BAD_REQUEST
+            );
+            $response->throttle();
+            return $response;
+        }
+
+        $share->setSharedWith($shareWith);
+        $share->setShareType(IShare::TYPE_REMOTE);
+
+        try {
+            $this->federatedShareProvider->create($share);
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'level' => ILogger::WARN,
+                'app' => 'federatedfilesharing',
+            ]);
+            return new JSONResponse(['message' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
+        }
+
+        return new JSONResponse(['remoteUrl' => $server]);
+    }
+
+    /**
+     * ask other server to get a federated share
+     *
+     * @NoAdminRequired
+     *
+     * @param string $token
+     * @param string $remote
+     * @param string $password
+     * @param string $owner (only for legacy reasons, can be removed with legacyMountPublicLink())
+     * @param string $ownerDisplayName (only for legacy reasons, can be removed with legacyMountPublicLink())
+     * @param string $name (only for legacy reasons, can be removed with legacyMountPublicLink())
+     * @return JSONResponse
+     */
+    public function askForFederatedShare($token, $remote, $password = '', $owner = '', $ownerDisplayName = '', $name = '') {
+        // check if server admin allows to mount public links from other servers
+        if ($this->federatedShareProvider->isIncomingServer2serverShareEnabled() === false) {
+            return new JSONResponse(['message' => $this->l->t('Server to server sharing is not enabled on this server')], Http::STATUS_BAD_REQUEST);
+        }
+
+        $cloudId = $this->cloudIdManager->getCloudId($this->userSession->getUser()->getUID(), $this->addressHandler->generateRemoteURL());
+
+        $httpClient = $this->clientService->newClient();
+
+        try {
+            $response = $httpClient->post($remote . '/index.php/apps/federatedfilesharing/createFederatedShare',
+                [
+                    'body' =>
+                        [
+                            'token' => $token,
+                            'shareWith' => rtrim($cloudId->getId(), '/'),
+                            'password' => $password
+                        ],
+                    'connect_timeout' => 10,
+                ]
+            );
+        } catch (\Exception $e) {
+            if (empty($password)) {
+                $message = $this->l->t("Couldn't establish a federated share.");
+            } else {
+                $message = $this->l->t("Couldn't establish a federated share, maybe the password was wrong.");
+            }
+            return new JSONResponse(['message' => $message], Http::STATUS_BAD_REQUEST);
+        }
+
+        $body = $response->getBody();
+        $result = json_decode($body, true);
+
+        if (is_array($result) && isset($result['remoteUrl'])) {
+            return new JSONResponse(['message' => $this->l->t('Federated Share request sent, you will receive an invitation. Check your notifications.')]);
+        }
+
+        // if we doesn't get the expected response we assume that we try to add
+        // a federated share from a Nextcloud <= 9 server
+        $message = $this->l->t("Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9).");
+        return new JSONResponse(['message' => $message], Http::STATUS_BAD_REQUEST);
+    }
 }

apps/files_versions/lib/Listener/LoadSidebarListener.php

Indentation +8 added lines, -8 removed lines

@@ -34,14 +34,14 @@
 use OCP\Util;
 
 class LoadSidebarListener implements IEventListener {
-	public function handle(Event $event): void {
-		if (!($event instanceof LoadSidebar)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof LoadSidebar)) {
+            return;
+        }
 
-		// TODO: make sure to only include the sidebar script when
-		// we properly split it between files list and sidebar
-		Util::addScript(Application::APP_ID, 'files_versions');
-	}
+        // TODO: make sure to only include the sidebar script when
+        // we properly split it between files list and sidebar
+        Util::addScript(Application::APP_ID, 'files_versions');
+    }
 
 }

apps/files_versions/lib/Listener/LoadAdditionalListener.php

Indentation +8 added lines, -8 removed lines

@@ -34,14 +34,14 @@
 use OCP\Util;
 
 class LoadAdditionalListener implements IEventListener {
-	public function handle(Event $event): void {
-		if (!($event instanceof LoadAdditionalScriptsEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof LoadAdditionalScriptsEvent)) {
+            return;
+        }
 
-		// TODO: make sure to only include the sidebar script when
-		// we properly split it between files list and sidebar
-		Util::addScript(Application::APP_ID, 'files_versions');
-	}
+        // TODO: make sure to only include the sidebar script when
+        // we properly split it between files list and sidebar
+        Util::addScript(Application::APP_ID, 'files_versions');
+    }
 
 }

apps/updatenotification/lib/Command/Check.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 		// Server
 		$r = $this->updateChecker->getUpdateState();
 		if (isset($r['updateAvailable']) && $r['updateAvailable']) {
-			$output->writeln($r['updateVersionString'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.');
+			$output->writeln($r['updateVersionString'].' is available. Get more information on how to update at '.$r['updateLink'].'.');
 			$updatesAvailableCount += 1;
 		}
 
@@ -78,7 +78,7 @@ 
 		foreach ($apps as $app) {
 			$update = $this->installer->isUpdateAvailable($app);
 			if ($update !== false) {
-				$output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.');
+				$output->writeln('Update for '.$app.' to version '.$update.' is available.');
 				$updatesAvailableCount += 1;
 			}
 		}
@@ -89,7 +89,7 @@ 
 		} elseif ($updatesAvailableCount === 1) {
 			$output->writeln('<comment>1 update available</comment>');
 		} else {
-			$output->writeln('<comment>' . $updatesAvailableCount . ' updates available</comment>');
+			$output->writeln('<comment>'.$updatesAvailableCount.' updates available</comment>');
 		}
 
 		return 0;

Indentation +51 added lines, -51 removed lines

@@ -37,65 +37,65 @@
 
 class Check extends Command {
 
-	/**
-	 * @var Installer $installer
-	 */
-	private $installer;
+    /**
+     * @var Installer $installer
+     */
+    private $installer;
 
-	/**
-	 * @var AppManager $appManager
-	 */
-	private $appManager;
+    /**
+     * @var AppManager $appManager
+     */
+    private $appManager;
 
-	/**
-	 * @var UpdateChecker $updateChecker
-	 */
-	private $updateChecker;
+    /**
+     * @var UpdateChecker $updateChecker
+     */
+    private $updateChecker;
 
-	public function __construct(AppManager $appManager, UpdateChecker $updateChecker, Installer $installer) {
-		parent::__construct();
-		$this->installer = $installer;
-		$this->appManager = $appManager;
-		$this->updateChecker = $updateChecker;
-	}
+    public function __construct(AppManager $appManager, UpdateChecker $updateChecker, Installer $installer) {
+        parent::__construct();
+        $this->installer = $installer;
+        $this->appManager = $appManager;
+        $this->updateChecker = $updateChecker;
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('update:check')
-			->setDescription('Check for server and app updates')
-		;
-	}
+    protected function configure(): void {
+        $this
+            ->setName('update:check')
+            ->setDescription('Check for server and app updates')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$updatesAvailableCount = 0;
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $updatesAvailableCount = 0;
 
-		// Server
-		$r = $this->updateChecker->getUpdateState();
-		if (isset($r['updateAvailable']) && $r['updateAvailable']) {
-			$output->writeln($r['updateVersionString'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.');
-			$updatesAvailableCount += 1;
-		}
+        // Server
+        $r = $this->updateChecker->getUpdateState();
+        if (isset($r['updateAvailable']) && $r['updateAvailable']) {
+            $output->writeln($r['updateVersionString'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.');
+            $updatesAvailableCount += 1;
+        }
 
 
-		// Apps
-		$apps = $this->appManager->getInstalledApps();
-		foreach ($apps as $app) {
-			$update = $this->installer->isUpdateAvailable($app);
-			if ($update !== false) {
-				$output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.');
-				$updatesAvailableCount += 1;
-			}
-		}
+        // Apps
+        $apps = $this->appManager->getInstalledApps();
+        foreach ($apps as $app) {
+            $update = $this->installer->isUpdateAvailable($app);
+            if ($update !== false) {
+                $output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.');
+                $updatesAvailableCount += 1;
+            }
+        }
 
-		// Report summary
-		if ($updatesAvailableCount === 0) {
-			$output->writeln('<info>Everything up to date</info>');
-		} elseif ($updatesAvailableCount === 1) {
-			$output->writeln('<comment>1 update available</comment>');
-		} else {
-			$output->writeln('<comment>' . $updatesAvailableCount . ' updates available</comment>');
-		}
+        // Report summary
+        if ($updatesAvailableCount === 0) {
+            $output->writeln('<info>Everything up to date</info>');
+        } elseif ($updatesAvailableCount === 1) {
+            $output->writeln('<comment>1 update available</comment>');
+        } else {
+            $output->writeln('<comment>' . $updatesAvailableCount . ' updates available</comment>');
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 }

apps/files_sharing/lib/Notification/Listener.php

Indentation +93 added lines, -93 removed lines

@@ -37,97 +37,97 @@
 
 class Listener {
 
-	/** @var INotificationManager */
-	protected $notificationManager;
-	/** @var IShareManager */
-	protected $shareManager;
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	public function __construct(
-		INotificationManager $notificationManager,
-		IShareManager $shareManager,
-		IGroupManager $groupManager
-	) {
-		$this->notificationManager = $notificationManager;
-		$this->shareManager = $shareManager;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * @param GenericEvent $event
-	 */
-	public function shareNotification(GenericEvent $event): void {
-		/** @var IShare $share */
-		$share = $event->getSubject();
-		$notification = $this->instantiateNotification($share);
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$notification->setSubject(Notifier::INCOMING_USER_SHARE)
-				->setUser($share->getSharedWith());
-			$this->notificationManager->notify($notification);
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$notification->setSubject(Notifier::INCOMING_GROUP_SHARE);
-			$group = $this->groupManager->get($share->getSharedWith());
-
-			foreach ($group->getUsers() as $user) {
-				if ($user->getUID() === $share->getShareOwner() ||
-					$user->getUID() === $share->getSharedBy()) {
-					continue;
-				}
-
-				$notification->setUser($user->getUID());
-				$this->notificationManager->notify($notification);
-			}
-		}
-	}
-
-	/**
-	 * @param GenericEvent $event
-	 */
-	public function userAddedToGroup(GenericEvent $event): void {
-		/** @var IGroup $group */
-		$group = $event->getSubject();
-		/** @var IUser $user */
-		$user = $event->getArgument('user');
-
-		$offset = 0;
-		while (true) {
-			$shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, 50, $offset);
-			if (empty($shares)) {
-				break;
-			}
-
-			foreach ($shares as $share) {
-				if ($share->getSharedWith() !== $group->getGID()) {
-					continue;
-				}
-
-				if ($user->getUID() === $share->getShareOwner() ||
-					$user->getUID() === $share->getSharedBy()) {
-					continue;
-				}
-
-				$notification = $this->instantiateNotification($share);
-				$notification->setSubject(Notifier::INCOMING_GROUP_SHARE)
-					->setUser($user->getUID());
-				$this->notificationManager->notify($notification);
-			}
-			$offset += 50;
-		}
-	}
-
-	/**
-	 * @param IShare $share
-	 * @return INotification
-	 */
-	protected function instantiateNotification(IShare $share): INotification {
-		$notification = $this->notificationManager->createNotification();
-		$notification
-			->setApp('files_sharing')
-			->setObject('share', $share->getFullId())
-			->setDateTime($share->getShareTime());
-
-		return $notification;
-	}
+    /** @var INotificationManager */
+    protected $notificationManager;
+    /** @var IShareManager */
+    protected $shareManager;
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    public function __construct(
+        INotificationManager $notificationManager,
+        IShareManager $shareManager,
+        IGroupManager $groupManager
+    ) {
+        $this->notificationManager = $notificationManager;
+        $this->shareManager = $shareManager;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * @param GenericEvent $event
+     */
+    public function shareNotification(GenericEvent $event): void {
+        /** @var IShare $share */
+        $share = $event->getSubject();
+        $notification = $this->instantiateNotification($share);
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $notification->setSubject(Notifier::INCOMING_USER_SHARE)
+                ->setUser($share->getSharedWith());
+            $this->notificationManager->notify($notification);
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $notification->setSubject(Notifier::INCOMING_GROUP_SHARE);
+            $group = $this->groupManager->get($share->getSharedWith());
+
+            foreach ($group->getUsers() as $user) {
+                if ($user->getUID() === $share->getShareOwner() ||
+                    $user->getUID() === $share->getSharedBy()) {
+                    continue;
+                }
+
+                $notification->setUser($user->getUID());
+                $this->notificationManager->notify($notification);
+            }
+        }
+    }
+
+    /**
+     * @param GenericEvent $event
+     */
+    public function userAddedToGroup(GenericEvent $event): void {
+        /** @var IGroup $group */
+        $group = $event->getSubject();
+        /** @var IUser $user */
+        $user = $event->getArgument('user');
+
+        $offset = 0;
+        while (true) {
+            $shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, 50, $offset);
+            if (empty($shares)) {
+                break;
+            }
+
+            foreach ($shares as $share) {
+                if ($share->getSharedWith() !== $group->getGID()) {
+                    continue;
+                }
+
+                if ($user->getUID() === $share->getShareOwner() ||
+                    $user->getUID() === $share->getSharedBy()) {
+                    continue;
+                }
+
+                $notification = $this->instantiateNotification($share);
+                $notification->setSubject(Notifier::INCOMING_GROUP_SHARE)
+                    ->setUser($user->getUID());
+                $this->notificationManager->notify($notification);
+            }
+            $offset += 50;
+        }
+    }
+
+    /**
+     * @param IShare $share
+     * @return INotification
+     */
+    protected function instantiateNotification(IShare $share): INotification {
+        $notification = $this->notificationManager->createNotification();
+        $notification
+            ->setApp('files_sharing')
+            ->setObject('share', $share->getFullId())
+            ->setDateTime($share->getShareTime());
+
+        return $notification;
+    }
 }

apps/workflowengine/lib/Check/AbstractStringCheck.php

Indentation +82 added lines, -82 removed lines

@@ -27,96 +27,96 @@
 
 abstract class AbstractStringCheck implements ICheck {
 
-	/** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
-	protected $matches;
+    /** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
+    protected $matches;
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string
-	 */
-	abstract protected function getActualValue();
+    /**
+     * @return string
+     */
+    abstract protected function getActualValue();
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$actualValue = $this->getActualValue();
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $actualValue = $this->getActualValue();
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $checkValue
-	 * @param string $actualValue
-	 * @return bool
-	 */
-	protected function executeStringCheck($operator, $checkValue, $actualValue) {
-		if ($operator === 'is') {
-			return $checkValue === $actualValue;
-		} elseif ($operator === '!is') {
-			return $checkValue !== $actualValue;
-		} else {
-			$match = $this->match($checkValue, $actualValue);
-			if ($operator === 'matches') {
-				return $match === 1;
-			} else {
-				return $match === 0;
-			}
-		}
-	}
+    /**
+     * @param string $operator
+     * @param string $checkValue
+     * @param string $actualValue
+     * @return bool
+     */
+    protected function executeStringCheck($operator, $checkValue, $actualValue) {
+        if ($operator === 'is') {
+            return $checkValue === $actualValue;
+        } elseif ($operator === '!is') {
+            return $checkValue !== $actualValue;
+        } else {
+            $match = $this->match($checkValue, $actualValue);
+            if ($operator === 'matches') {
+                return $match === 1;
+            } else {
+                return $match === 0;
+            }
+        }
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
 
-		if (in_array($operator, ['matches', '!matches']) &&
-			  @preg_match($value, null) === false) {
-			throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
-		}
-	}
+        if (in_array($operator, ['matches', '!matches']) &&
+              @preg_match($value, null) === false) {
+            throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
+        }
+    }
 
-	public function supportedEntities(): array {
-		// universal by default
-		return [];
-	}
+    public function supportedEntities(): array {
+        // universal by default
+        return [];
+    }
 
-	public function isAvailableForScope(int $scope): bool {
-		// admin only by default
-		return $scope === IManager::SCOPE_ADMIN;
-	}
+    public function isAvailableForScope(int $scope): bool {
+        // admin only by default
+        return $scope === IManager::SCOPE_ADMIN;
+    }
 
-	/**
-	 * @param string $pattern
-	 * @param string $subject
-	 * @return int|bool
-	 */
-	protected function match($pattern, $subject) {
-		$patternHash = md5($pattern);
-		$subjectHash = md5($subject);
-		if (isset($this->matches[$patternHash][$subjectHash])) {
-			return $this->matches[$patternHash][$subjectHash];
-		}
-		if (!isset($this->matches[$patternHash])) {
-			$this->matches[$patternHash] = [];
-		}
-		$this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
-		return $this->matches[$patternHash][$subjectHash];
-	}
+    /**
+     * @param string $pattern
+     * @param string $subject
+     * @return int|bool
+     */
+    protected function match($pattern, $subject) {
+        $patternHash = md5($pattern);
+        $subjectHash = md5($subject);
+        if (isset($this->matches[$patternHash][$subjectHash])) {
+            return $this->matches[$patternHash][$subjectHash];
+        }
+        if (!isset($this->matches[$patternHash])) {
+            $this->matches[$patternHash] = [];
+        }
+        $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
+        return $this->matches[$patternHash][$subjectHash];
+    }
 }

apps/settings/templates/settings/empty.php

Indentation +1 added lines, -1 removed lines

@@ -21,4 +21,4 @@
  *
  */
 
-	# used for Personal/Additional settings as fallback for legacy settings
+    # used for Personal/Additional settings as fallback for legacy settings

lib/private/Authentication/Login/TwoFactorCommand.php

Indentation +48 added lines, -48 removed lines

@@ -35,61 +35,61 @@
 
 class TwoFactorCommand extends ALoginCommand {
 
-	/** @var Manager */
-	private $twoFactorManager;
+    /** @var Manager */
+    private $twoFactorManager;
 
-	/** @var MandatoryTwoFactor */
-	private $mandatoryTwoFactor;
+    /** @var MandatoryTwoFactor */
+    private $mandatoryTwoFactor;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(Manager $twoFactorManager,
-								MandatoryTwoFactor $mandatoryTwoFactor,
-								IURLGenerator $urlGenerator) {
-		$this->twoFactorManager = $twoFactorManager;
-		$this->mandatoryTwoFactor = $mandatoryTwoFactor;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(Manager $twoFactorManager,
+                                MandatoryTwoFactor $mandatoryTwoFactor,
+                                IURLGenerator $urlGenerator) {
+        $this->twoFactorManager = $twoFactorManager;
+        $this->mandatoryTwoFactor = $mandatoryTwoFactor;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function process(LoginData $loginData): LoginResult {
-		if (!$this->twoFactorManager->isTwoFactorAuthenticated($loginData->getUser())) {
-			return $this->processNextOrFinishSuccessfully($loginData);
-		}
+    public function process(LoginData $loginData): LoginResult {
+        if (!$this->twoFactorManager->isTwoFactorAuthenticated($loginData->getUser())) {
+            return $this->processNextOrFinishSuccessfully($loginData);
+        }
 
-		$this->twoFactorManager->prepareTwoFactorLogin($loginData->getUser(), $loginData->isRememberLogin());
+        $this->twoFactorManager->prepareTwoFactorLogin($loginData->getUser(), $loginData->isRememberLogin());
 
-		$providerSet = $this->twoFactorManager->getProviderSet($loginData->getUser());
-		$loginProviders = $this->twoFactorManager->getLoginSetupProviders($loginData->getUser());
-		$providers = $providerSet->getPrimaryProviders();
-		if (empty($providers)
-			&& !$providerSet->isProviderMissing()
-			&& !empty($loginProviders)
-			&& $this->mandatoryTwoFactor->isEnforcedFor($loginData->getUser())) {
-			// No providers set up, but 2FA is enforced and setup providers are available
-			$url = 'core.TwoFactorChallenge.setupProviders';
-			$urlParams = [];
-		} elseif (!$providerSet->isProviderMissing() && count($providers) === 1) {
-			// Single provider (and no missing ones), hence we can redirect to that provider's challenge page directly
-			/* @var $provider IProvider */
-			$provider = array_pop($providers);
-			$url = 'core.TwoFactorChallenge.showChallenge';
-			$urlParams = [
-				'challengeProviderId' => $provider->getId(),
-			];
-		} else {
-			$url = 'core.TwoFactorChallenge.selectChallenge';
-			$urlParams = [];
-		}
+        $providerSet = $this->twoFactorManager->getProviderSet($loginData->getUser());
+        $loginProviders = $this->twoFactorManager->getLoginSetupProviders($loginData->getUser());
+        $providers = $providerSet->getPrimaryProviders();
+        if (empty($providers)
+            && !$providerSet->isProviderMissing()
+            && !empty($loginProviders)
+            && $this->mandatoryTwoFactor->isEnforcedFor($loginData->getUser())) {
+            // No providers set up, but 2FA is enforced and setup providers are available
+            $url = 'core.TwoFactorChallenge.setupProviders';
+            $urlParams = [];
+        } elseif (!$providerSet->isProviderMissing() && count($providers) === 1) {
+            // Single provider (and no missing ones), hence we can redirect to that provider's challenge page directly
+            /* @var $provider IProvider */
+            $provider = array_pop($providers);
+            $url = 'core.TwoFactorChallenge.showChallenge';
+            $urlParams = [
+                'challengeProviderId' => $provider->getId(),
+            ];
+        } else {
+            $url = 'core.TwoFactorChallenge.selectChallenge';
+            $urlParams = [];
+        }
 
-		if ($loginData->getRedirectUrl() !== null) {
-			$urlParams['redirect_url'] = $loginData->getRedirectUrl();
-		}
+        if ($loginData->getRedirectUrl() !== null) {
+            $urlParams['redirect_url'] = $loginData->getRedirectUrl();
+        }
 
-		return LoginResult::success(
-			$loginData,
-			$this->urlGenerator->linkToRoute($url, $urlParams)
-		);
-	}
+        return LoginResult::success(
+            $loginData,
+            $this->urlGenerator->linkToRoute($url, $urlParams)
+        );
+    }
 
 }