nextcloud / server

apps/files_external/lib/Controller/UserStoragesController.php

Indentation +177 added lines, -177 removed lines

@@ -45,181 +45,181 @@
  * User storages controller
  */
 class UserStoragesController extends StoragesController {
-	/**
-	 * Creates a new user storages controller.
-	 *
-	 * @param string $AppName application name
-	 * @param IRequest $request request object
-	 * @param IL10N $l10n l10n service
-	 * @param UserStoragesService $userStoragesService storage service
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(
-		$AppName,
-		IRequest $request,
-		IL10N $l10n,
-		UserStoragesService $userStoragesService,
-		ILogger $logger,
-		IUserSession $userSession,
-		IGroupManager $groupManager
-	) {
-		parent::__construct(
-			$AppName,
-			$request,
-			$l10n,
-			$userStoragesService,
-			$logger,
-			$userSession,
-			$groupManager
-		);
-	}
-
-	protected function manipulateStorageConfig(StorageConfig $storage) {
-		/** @var AuthMechanism */
-		$authMechanism = $storage->getAuthMechanism();
-		$authMechanism->manipulateStorageConfig($storage, $this->userSession->getUser());
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		$backend->manipulateStorageConfig($storage, $this->userSession->getUser());
-	}
-
-	/**
-	 * Get all storage entries
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function index() {
-		return parent::index();
-	}
-
-	/**
-	 * Return storage
-	 *
-	 * @NoAdminRequired
-	 *
-	 * {@inheritdoc}
-	 */
-	public function show($id, $testOnly = true) {
-		return parent::show($id, $testOnly);
-	}
-
-	/**
-	 * Create an external storage entry.
-	 *
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions backend-specific mount options
-	 *
-	 * @return DataResponse
-	 *
-	 * @NoAdminRequired
-	 */
-	public function create(
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions
-	) {
-		$newStorage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions
-		);
-		if ($newStorage instanceof DataResponse) {
-			return $newStorage;
-		}
-
-		$response = $this->validate($newStorage);
-		if (!empty($response)) {
-			return $response;
-		}
-
-		$newStorage = $this->service->addStorage($newStorage);
-		$this->updateStorageStatus($newStorage);
-
-		return new DataResponse(
-			$this->formatStorageForUI($newStorage),
-			Http::STATUS_CREATED
-		);
-	}
-
-	/**
-	 * Update an external storage entry.
-	 *
-	 * @param int $id storage id
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions backend-specific mount options
-	 * @param bool $testOnly whether to storage should only test the connection or do more things
-	 *
-	 * @return DataResponse
-	 *
-	 * @NoAdminRequired
-	 */
-	public function update(
-		$id,
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$testOnly = true
-	) {
-		$storage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions
-		);
-		if ($storage instanceof DataResponse) {
-			return $storage;
-		}
-		$storage->setId($id);
-
-		$response = $this->validate($storage);
-		if (!empty($response)) {
-			return $response;
-		}
-
-		try {
-			$storage = $this->service->updateStorage($storage);
-		} catch (NotFoundException $e) {
-			return new DataResponse(
-				[
-					'message' => $this->l10n->t('Storage with ID "%d" not found', [$id])
-				],
-				Http::STATUS_NOT_FOUND
-			);
-		}
-
-		$this->updateStorageStatus($storage, $testOnly);
-
-		return new DataResponse(
-			$this->formatStorageForUI($storage),
-			Http::STATUS_OK
-		);
-	}
-
-	/**
-	 * Delete storage
-	 *
-	 * @NoAdminRequired
-	 *
-	 * {@inheritdoc}
-	 */
-	public function destroy($id) {
-		return parent::destroy($id);
-	}
+    /**
+     * Creates a new user storages controller.
+     *
+     * @param string $AppName application name
+     * @param IRequest $request request object
+     * @param IL10N $l10n l10n service
+     * @param UserStoragesService $userStoragesService storage service
+     * @param ILogger $logger
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(
+        $AppName,
+        IRequest $request,
+        IL10N $l10n,
+        UserStoragesService $userStoragesService,
+        ILogger $logger,
+        IUserSession $userSession,
+        IGroupManager $groupManager
+    ) {
+        parent::__construct(
+            $AppName,
+            $request,
+            $l10n,
+            $userStoragesService,
+            $logger,
+            $userSession,
+            $groupManager
+        );
+    }
+
+    protected function manipulateStorageConfig(StorageConfig $storage) {
+        /** @var AuthMechanism */
+        $authMechanism = $storage->getAuthMechanism();
+        $authMechanism->manipulateStorageConfig($storage, $this->userSession->getUser());
+        /** @var Backend */
+        $backend = $storage->getBackend();
+        $backend->manipulateStorageConfig($storage, $this->userSession->getUser());
+    }
+
+    /**
+     * Get all storage entries
+     *
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function index() {
+        return parent::index();
+    }
+
+    /**
+     * Return storage
+     *
+     * @NoAdminRequired
+     *
+     * {@inheritdoc}
+     */
+    public function show($id, $testOnly = true) {
+        return parent::show($id, $testOnly);
+    }
+
+    /**
+     * Create an external storage entry.
+     *
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions backend-specific mount options
+     *
+     * @return DataResponse
+     *
+     * @NoAdminRequired
+     */
+    public function create(
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions
+    ) {
+        $newStorage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions
+        );
+        if ($newStorage instanceof DataResponse) {
+            return $newStorage;
+        }
+
+        $response = $this->validate($newStorage);
+        if (!empty($response)) {
+            return $response;
+        }
+
+        $newStorage = $this->service->addStorage($newStorage);
+        $this->updateStorageStatus($newStorage);
+
+        return new DataResponse(
+            $this->formatStorageForUI($newStorage),
+            Http::STATUS_CREATED
+        );
+    }
+
+    /**
+     * Update an external storage entry.
+     *
+     * @param int $id storage id
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions backend-specific mount options
+     * @param bool $testOnly whether to storage should only test the connection or do more things
+     *
+     * @return DataResponse
+     *
+     * @NoAdminRequired
+     */
+    public function update(
+        $id,
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $testOnly = true
+    ) {
+        $storage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions
+        );
+        if ($storage instanceof DataResponse) {
+            return $storage;
+        }
+        $storage->setId($id);
+
+        $response = $this->validate($storage);
+        if (!empty($response)) {
+            return $response;
+        }
+
+        try {
+            $storage = $this->service->updateStorage($storage);
+        } catch (NotFoundException $e) {
+            return new DataResponse(
+                [
+                    'message' => $this->l10n->t('Storage with ID "%d" not found', [$id])
+                ],
+                Http::STATUS_NOT_FOUND
+            );
+        }
+
+        $this->updateStorageStatus($storage, $testOnly);
+
+        return new DataResponse(
+            $this->formatStorageForUI($storage),
+            Http::STATUS_OK
+        );
+    }
+
+    /**
+     * Delete storage
+     *
+     * @NoAdminRequired
+     *
+     * {@inheritdoc}
+     */
+    public function destroy($id) {
+        return parent::destroy($id);
+    }
 }

apps/files_external/lib/Controller/UserGlobalStoragesController.php

Indentation +162 added lines, -162 removed lines

@@ -47,166 +47,166 @@
  * User global storages controller
  */
 class UserGlobalStoragesController extends StoragesController {
-	/**
-	 * Creates a new user global storages controller.
-	 *
-	 * @param string $AppName application name
-	 * @param IRequest $request request object
-	 * @param IL10N $l10n l10n service
-	 * @param UserGlobalStoragesService $userGlobalStoragesService storage service
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(
-		$AppName,
-		IRequest $request,
-		IL10N $l10n,
-		UserGlobalStoragesService $userGlobalStoragesService,
-		ILogger $logger,
-		IUserSession $userSession,
-		IGroupManager $groupManager
-	) {
-		parent::__construct(
-			$AppName,
-			$request,
-			$l10n,
-			$userGlobalStoragesService,
-			$logger,
-			$userSession,
-			$groupManager
-		);
-	}
-
-	/**
-	 * Get all storage entries
-	 *
-	 * @return DataResponse
-	 *
-	 * @NoAdminRequired
-	 */
-	public function index() {
-		$storages = $this->formatStoragesForUI($this->service->getUniqueStorages());
-
-		// remove configuration data, this must be kept private
-		foreach ($storages as $storage) {
-			$this->sanitizeStorage($storage);
-		}
-
-		return new DataResponse(
-			$storages,
-			Http::STATUS_OK
-		);
-	}
-
-	protected function manipulateStorageConfig(StorageConfig $storage) {
-		/** @var AuthMechanism */
-		$authMechanism = $storage->getAuthMechanism();
-		$authMechanism->manipulateStorageConfig($storage, $this->userSession->getUser());
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		$backend->manipulateStorageConfig($storage, $this->userSession->getUser());
-	}
-
-	/**
-	 * Get an external storage entry.
-	 *
-	 * @param int $id storage id
-	 * @param bool $testOnly whether to storage should only test the connection or do more things
-	 * @return DataResponse
-	 *
-	 * @NoAdminRequired
-	 */
-	public function show($id, $testOnly = true) {
-		try {
-			$storage = $this->service->getStorage($id);
-
-			$this->updateStorageStatus($storage, $testOnly);
-		} catch (NotFoundException $e) {
-			return new DataResponse(
-				[
-					'message' => $this->l10n->t('Storage with ID "%d" not found', [$id])
-				],
-				Http::STATUS_NOT_FOUND
-			);
-		}
-
-		$this->sanitizeStorage($storage);
-
-		$data = $this->formatStorageForUI($storage)->jsonSerialize();
-		$isAdmin = $this->groupManager->isAdmin($this->userSession->getUser()->getUID());
-		$data['can_edit'] = $storage->getType() === StorageConfig::MOUNT_TYPE_PERSONAl || $isAdmin;
-
-		return new DataResponse(
-			$data,
-			Http::STATUS_OK
-		);
-	}
-
-	/**
-	 * Update an external storage entry.
-	 * Only allows setting user provided backend fields
-	 *
-	 * @param int $id storage id
-	 * @param array $backendOptions backend-specific options
-	 * @param bool $testOnly whether to storage should only test the connection or do more things
-	 *
-	 * @return DataResponse
-	 *
-	 * @NoAdminRequired
-	 */
-	public function update(
-		$id,
-		$backendOptions,
-		$testOnly = true
-	) {
-		try {
-			$storage = $this->service->getStorage($id);
-			$authMechanism = $storage->getAuthMechanism();
-			if ($authMechanism instanceof IUserProvided || $authMechanism instanceof  UserGlobalAuth) {
-				$authMechanism->saveBackendOptions($this->userSession->getUser(), $id, $backendOptions);
-				$authMechanism->manipulateStorageConfig($storage, $this->userSession->getUser());
-			} else {
-				return new DataResponse(
-					[
-						'message' => $this->l10n->t('Storage with ID "%d" is not user editable', [$id])
-					],
-					Http::STATUS_FORBIDDEN
-				);
-			}
-		} catch (NotFoundException $e) {
-			return new DataResponse(
-				[
-					'message' => $this->l10n->t('Storage with ID "%d" not found', [$id])
-				],
-				Http::STATUS_NOT_FOUND
-			);
-		}
-
-		$this->updateStorageStatus($storage, $testOnly);
-		$this->sanitizeStorage($storage);
-
-		return new DataResponse(
-			$this->formatStorageForUI($storage),
-			Http::STATUS_OK
-		);
-	}
-
-	/**
-	 * Remove sensitive data from a StorageConfig before returning it to the user
-	 *
-	 * @param StorageConfig $storage
-	 */
-	protected function sanitizeStorage(StorageConfig $storage) {
-		$storage->setBackendOptions([]);
-		$storage->setMountOptions([]);
-
-		if ($storage->getAuthMechanism() instanceof IUserProvided) {
-			try {
-				$storage->getAuthMechanism()->manipulateStorageConfig($storage, $this->userSession->getUser());
-			} catch (InsufficientDataForMeaningfulAnswerException $e) {
-				// not configured yet
-			}
-		}
-	}
+    /**
+     * Creates a new user global storages controller.
+     *
+     * @param string $AppName application name
+     * @param IRequest $request request object
+     * @param IL10N $l10n l10n service
+     * @param UserGlobalStoragesService $userGlobalStoragesService storage service
+     * @param ILogger $logger
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(
+        $AppName,
+        IRequest $request,
+        IL10N $l10n,
+        UserGlobalStoragesService $userGlobalStoragesService,
+        ILogger $logger,
+        IUserSession $userSession,
+        IGroupManager $groupManager
+    ) {
+        parent::__construct(
+            $AppName,
+            $request,
+            $l10n,
+            $userGlobalStoragesService,
+            $logger,
+            $userSession,
+            $groupManager
+        );
+    }
+
+    /**
+     * Get all storage entries
+     *
+     * @return DataResponse
+     *
+     * @NoAdminRequired
+     */
+    public function index() {
+        $storages = $this->formatStoragesForUI($this->service->getUniqueStorages());
+
+        // remove configuration data, this must be kept private
+        foreach ($storages as $storage) {
+            $this->sanitizeStorage($storage);
+        }
+
+        return new DataResponse(
+            $storages,
+            Http::STATUS_OK
+        );
+    }
+
+    protected function manipulateStorageConfig(StorageConfig $storage) {
+        /** @var AuthMechanism */
+        $authMechanism = $storage->getAuthMechanism();
+        $authMechanism->manipulateStorageConfig($storage, $this->userSession->getUser());
+        /** @var Backend */
+        $backend = $storage->getBackend();
+        $backend->manipulateStorageConfig($storage, $this->userSession->getUser());
+    }
+
+    /**
+     * Get an external storage entry.
+     *
+     * @param int $id storage id
+     * @param bool $testOnly whether to storage should only test the connection or do more things
+     * @return DataResponse
+     *
+     * @NoAdminRequired
+     */
+    public function show($id, $testOnly = true) {
+        try {
+            $storage = $this->service->getStorage($id);
+
+            $this->updateStorageStatus($storage, $testOnly);
+        } catch (NotFoundException $e) {
+            return new DataResponse(
+                [
+                    'message' => $this->l10n->t('Storage with ID "%d" not found', [$id])
+                ],
+                Http::STATUS_NOT_FOUND
+            );
+        }
+
+        $this->sanitizeStorage($storage);
+
+        $data = $this->formatStorageForUI($storage)->jsonSerialize();
+        $isAdmin = $this->groupManager->isAdmin($this->userSession->getUser()->getUID());
+        $data['can_edit'] = $storage->getType() === StorageConfig::MOUNT_TYPE_PERSONAl || $isAdmin;
+
+        return new DataResponse(
+            $data,
+            Http::STATUS_OK
+        );
+    }
+
+    /**
+     * Update an external storage entry.
+     * Only allows setting user provided backend fields
+     *
+     * @param int $id storage id
+     * @param array $backendOptions backend-specific options
+     * @param bool $testOnly whether to storage should only test the connection or do more things
+     *
+     * @return DataResponse
+     *
+     * @NoAdminRequired
+     */
+    public function update(
+        $id,
+        $backendOptions,
+        $testOnly = true
+    ) {
+        try {
+            $storage = $this->service->getStorage($id);
+            $authMechanism = $storage->getAuthMechanism();
+            if ($authMechanism instanceof IUserProvided || $authMechanism instanceof  UserGlobalAuth) {
+                $authMechanism->saveBackendOptions($this->userSession->getUser(), $id, $backendOptions);
+                $authMechanism->manipulateStorageConfig($storage, $this->userSession->getUser());
+            } else {
+                return new DataResponse(
+                    [
+                        'message' => $this->l10n->t('Storage with ID "%d" is not user editable', [$id])
+                    ],
+                    Http::STATUS_FORBIDDEN
+                );
+            }
+        } catch (NotFoundException $e) {
+            return new DataResponse(
+                [
+                    'message' => $this->l10n->t('Storage with ID "%d" not found', [$id])
+                ],
+                Http::STATUS_NOT_FOUND
+            );
+        }
+
+        $this->updateStorageStatus($storage, $testOnly);
+        $this->sanitizeStorage($storage);
+
+        return new DataResponse(
+            $this->formatStorageForUI($storage),
+            Http::STATUS_OK
+        );
+    }
+
+    /**
+     * Remove sensitive data from a StorageConfig before returning it to the user
+     *
+     * @param StorageConfig $storage
+     */
+    protected function sanitizeStorage(StorageConfig $storage) {
+        $storage->setBackendOptions([]);
+        $storage->setMountOptions([]);
+
+        if ($storage->getAuthMechanism() instanceof IUserProvided) {
+            try {
+                $storage->getAuthMechanism()->manipulateStorageConfig($storage, $this->userSession->getUser());
+            } catch (InsufficientDataForMeaningfulAnswerException $e) {
+                // not configured yet
+            }
+        }
+    }
 }

apps/files_external/lib/Controller/GlobalStoragesController.php

Indentation +140 added lines, -140 removed lines

@@ -42,154 +42,154 @@
  * Global storages controller
  */
 class GlobalStoragesController extends StoragesController {
-	/**
-	 * Creates a new global storages controller.
-	 *
-	 * @param string $AppName application name
-	 * @param IRequest $request request object
-	 * @param IL10N $l10n l10n service
-	 * @param GlobalStoragesService $globalStoragesService storage service
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(
-		$AppName,
-		IRequest $request,
-		IL10N $l10n,
-		GlobalStoragesService $globalStoragesService,
-		ILogger $logger,
-		IUserSession $userSession,
-		IGroupManager $groupManager
-	) {
-		parent::__construct(
-			$AppName,
-			$request,
-			$l10n,
-			$globalStoragesService,
-			$logger,
-			$userSession,
-			$groupManager
-		);
-	}
+    /**
+     * Creates a new global storages controller.
+     *
+     * @param string $AppName application name
+     * @param IRequest $request request object
+     * @param IL10N $l10n l10n service
+     * @param GlobalStoragesService $globalStoragesService storage service
+     * @param ILogger $logger
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(
+        $AppName,
+        IRequest $request,
+        IL10N $l10n,
+        GlobalStoragesService $globalStoragesService,
+        ILogger $logger,
+        IUserSession $userSession,
+        IGroupManager $groupManager
+    ) {
+        parent::__construct(
+            $AppName,
+            $request,
+            $l10n,
+            $globalStoragesService,
+            $logger,
+            $userSession,
+            $groupManager
+        );
+    }
 
-	/**
-	 * Create an external storage entry.
-	 *
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions mount-specific options
-	 * @param array $applicableUsers users for which to mount the storage
-	 * @param array $applicableGroups groups for which to mount the storage
-	 * @param int $priority priority
-	 *
-	 * @return DataResponse
-	 */
-	public function create(
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$applicableUsers,
-		$applicableGroups,
-		$priority
-	) {
-		$newStorage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-		if ($newStorage instanceof DataResponse) {
-			return $newStorage;
-		}
+    /**
+     * Create an external storage entry.
+     *
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions mount-specific options
+     * @param array $applicableUsers users for which to mount the storage
+     * @param array $applicableGroups groups for which to mount the storage
+     * @param int $priority priority
+     *
+     * @return DataResponse
+     */
+    public function create(
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $applicableUsers,
+        $applicableGroups,
+        $priority
+    ) {
+        $newStorage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+        if ($newStorage instanceof DataResponse) {
+            return $newStorage;
+        }
 
-		$response = $this->validate($newStorage);
-		if (!empty($response)) {
-			return $response;
-		}
+        $response = $this->validate($newStorage);
+        if (!empty($response)) {
+            return $response;
+        }
 
-		$newStorage = $this->service->addStorage($newStorage);
+        $newStorage = $this->service->addStorage($newStorage);
 
-		$this->updateStorageStatus($newStorage);
+        $this->updateStorageStatus($newStorage);
 
-		return new DataResponse(
-			$this->formatStorageForUI($newStorage),
-			Http::STATUS_CREATED
-		);
-	}
+        return new DataResponse(
+            $this->formatStorageForUI($newStorage),
+            Http::STATUS_CREATED
+        );
+    }
 
-	/**
-	 * Update an external storage entry.
-	 *
-	 * @param int $id storage id
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechansim identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions mount-specific options
-	 * @param array $applicableUsers users for which to mount the storage
-	 * @param array $applicableGroups groups for which to mount the storage
-	 * @param int $priority priority
-	 * @param bool $testOnly whether to storage should only test the connection or do more things
-	 *
-	 * @return DataResponse
-	 */
-	public function update(
-		$id,
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$applicableUsers,
-		$applicableGroups,
-		$priority,
-		$testOnly = true
-	) {
-		$storage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-		if ($storage instanceof DataResponse) {
-			return $storage;
-		}
-		$storage->setId($id);
+    /**
+     * Update an external storage entry.
+     *
+     * @param int $id storage id
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechansim identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions mount-specific options
+     * @param array $applicableUsers users for which to mount the storage
+     * @param array $applicableGroups groups for which to mount the storage
+     * @param int $priority priority
+     * @param bool $testOnly whether to storage should only test the connection or do more things
+     *
+     * @return DataResponse
+     */
+    public function update(
+        $id,
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $applicableUsers,
+        $applicableGroups,
+        $priority,
+        $testOnly = true
+    ) {
+        $storage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+        if ($storage instanceof DataResponse) {
+            return $storage;
+        }
+        $storage->setId($id);
 
-		$response = $this->validate($storage);
-		if (!empty($response)) {
-			return $response;
-		}
+        $response = $this->validate($storage);
+        if (!empty($response)) {
+            return $response;
+        }
 
-		try {
-			$storage = $this->service->updateStorage($storage);
-		} catch (NotFoundException $e) {
-			return new DataResponse(
-				[
-					'message' => $this->l10n->t('Storage with ID "%d" not found', [$id])
-				],
-				Http::STATUS_NOT_FOUND
-			);
-		}
+        try {
+            $storage = $this->service->updateStorage($storage);
+        } catch (NotFoundException $e) {
+            return new DataResponse(
+                [
+                    'message' => $this->l10n->t('Storage with ID "%d" not found', [$id])
+                ],
+                Http::STATUS_NOT_FOUND
+            );
+        }
 
-		$this->updateStorageStatus($storage, $testOnly);
+        $this->updateStorageStatus($storage, $testOnly);
 
-		return new DataResponse(
-			$this->formatStorageForUI($storage),
-			Http::STATUS_OK
-		);
-	}
+        return new DataResponse(
+            $this->formatStorageForUI($storage),
+            Http::STATUS_OK
+        );
+    }
 }

apps/files_external/lib/MountConfig.php

Indentation +337 added lines, -337 removed lines

@@ -57,341 +57,341 @@
  * Class to configure mount.json globally and for users
  */
 class MountConfig {
-	// TODO: make this class non-static and give it a proper namespace
-
-	public const MOUNT_TYPE_GLOBAL = 'global';
-	public const MOUNT_TYPE_GROUP = 'group';
-	public const MOUNT_TYPE_USER = 'user';
-	public const MOUNT_TYPE_PERSONAL = 'personal';
-
-	// whether to skip backend test (for unit tests, as this static class is not mockable)
-	public static $skipTest = false;
-
-	/** @var Application */
-	public static $app;
-
-	/**
-	 * Returns the mount points for the given user.
-	 * The mount point is relative to the data directory.
-	 *
-	 * @param string $uid user
-	 * @return array of mount point string as key, mountpoint config as value
-	 *
-	 * @deprecated 8.2.0 use UserGlobalStoragesService::getStorages() and UserStoragesService::getStorages()
-	 */
-	public static function getAbsoluteMountPoints($uid) {
-		$mountPoints = [];
-
-		$userGlobalStoragesService = self::$app->getContainer()->query(UserGlobalStoragesService::class);
-		$userStoragesService = self::$app->getContainer()->query(UserStoragesService::class);
-		$user = self::$app->getContainer()->query(IUserManager::class)->get($uid);
-
-		$userGlobalStoragesService->setUser($user);
-		$userStoragesService->setUser($user);
-
-		foreach ($userGlobalStoragesService->getStorages() as $storage) {
-			/** @var \OCA\Files_External\Lib\StorageConfig $storage */
-			$mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
-			$mountEntry = self::prepareMountPointEntry($storage, false);
-			foreach ($mountEntry['options'] as &$option) {
-				$option = self::substitutePlaceholdersInConfig($option, $uid);
-			}
-			$mountPoints[$mountPoint] = $mountEntry;
-		}
-
-		foreach ($userStoragesService->getStorages() as $storage) {
-			$mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
-			$mountEntry = self::prepareMountPointEntry($storage, true);
-			foreach ($mountEntry['options'] as &$option) {
-				$option = self::substitutePlaceholdersInConfig($option, $uid);
-			}
-			$mountPoints[$mountPoint] = $mountEntry;
-		}
-
-		$userGlobalStoragesService->resetUser();
-		$userStoragesService->resetUser();
-
-		return $mountPoints;
-	}
-
-	/**
-	 * Get the system mount points
-	 *
-	 * @return array
-	 *
-	 * @deprecated 8.2.0 use GlobalStoragesService::getStorages()
-	 */
-	public static function getSystemMountPoints() {
-		$mountPoints = [];
-		$service = self::$app->getContainer()->query(GlobalStoragesService::class);
-
-		foreach ($service->getStorages() as $storage) {
-			$mountPoints[] = self::prepareMountPointEntry($storage, false);
-		}
-
-		return $mountPoints;
-	}
-
-	/**
-	 * Convert a StorageConfig to the legacy mountPoints array format
-	 * There's a lot of extra information in here, to satisfy all of the legacy functions
-	 *
-	 * @param StorageConfig $storage
-	 * @param bool $isPersonal
-	 * @return array
-	 */
-	private static function prepareMountPointEntry(StorageConfig $storage, $isPersonal) {
-		$mountEntry = [];
-
-		$mountEntry['mountpoint'] = substr($storage->getMountPoint(), 1); // remove leading slash
-		$mountEntry['class'] = $storage->getBackend()->getIdentifier();
-		$mountEntry['backend'] = $storage->getBackend()->getText();
-		$mountEntry['authMechanism'] = $storage->getAuthMechanism()->getIdentifier();
-		$mountEntry['personal'] = $isPersonal;
-		$mountEntry['options'] = self::decryptPasswords($storage->getBackendOptions());
-		$mountEntry['mountOptions'] = $storage->getMountOptions();
-		$mountEntry['priority'] = $storage->getPriority();
-		$mountEntry['applicable'] = [
-			'groups' => $storage->getApplicableGroups(),
-			'users' => $storage->getApplicableUsers(),
-		];
-		// if mountpoint is applicable to all users the old API expects ['all']
-		if (empty($mountEntry['applicable']['groups']) && empty($mountEntry['applicable']['users'])) {
-			$mountEntry['applicable']['users'] = ['all'];
-		}
-
-		$mountEntry['id'] = $storage->getId();
-
-		return $mountEntry;
-	}
-
-	/**
-	 * @param mixed $input
-	 * @param string|null $userId
-	 * @return mixed
-	 * @throws \OCP\AppFramework\QueryException
-	 * @since 16.0.0
-	 */
-	public static function substitutePlaceholdersInConfig($input, string $userId = null) {
-		/** @var BackendService $backendService */
-		$backendService = self::$app->getContainer()->query(BackendService::class);
-		/** @var IConfigHandler[] $handlers */
-		$handlers = $backendService->getConfigHandlers();
-		foreach ($handlers as $handler) {
-			if ($handler instanceof UserContext && $userId !== null) {
-				$handler->setUserId($userId);
-			}
-			$input = $handler->handle($input);
-		}
-		return $input;
-	}
-
-	/**
-	 * Test connecting using the given backend configuration
-	 *
-	 * @param string $class backend class name
-	 * @param array $options backend configuration options
-	 * @param boolean $isPersonal
-	 * @return int see self::STATUS_*
-	 * @throws Exception
-	 */
-	public static function getBackendStatus($class, $options, $isPersonal, $testOnly = true) {
-		if (self::$skipTest) {
-			return StorageNotAvailableException::STATUS_SUCCESS;
-		}
-		foreach ($options as $key => &$option) {
-			if ($key === 'password') {
-				// no replacements in passwords
-				continue;
-			}
-			$option = self::substitutePlaceholdersInConfig($option);
-		}
-		if (class_exists($class)) {
-			try {
-				/** @var \OC\Files\Storage\Common $storage */
-				$storage = new $class($options);
-
-				try {
-					$result = $storage->test($isPersonal, $testOnly);
-					$storage->setAvailability($result);
-					if ($result) {
-						return StorageNotAvailableException::STATUS_SUCCESS;
-					}
-				} catch (\Exception $e) {
-					$storage->setAvailability(false);
-					throw $e;
-				}
-			} catch (Exception $exception) {
-				\OC::$server->getLogger()->logException($exception, ['app' => 'files_external']);
-				throw $exception;
-			}
-		}
-		return StorageNotAvailableException::STATUS_ERROR;
-	}
-
-	/**
-	 * Read the mount points in the config file into an array
-	 *
-	 * @param string|null $user If not null, personal for $user, otherwise system
-	 * @return array
-	 */
-	public static function readData($user = null) {
-		if (isset($user)) {
-			$jsonFile = \OC::$server->getUserManager()->get($user)->getHome() . '/mount.json';
-		} else {
-			$config = \OC::$server->getConfig();
-			$datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
-			$jsonFile = $config->getSystemValue('mount_file', $datadir . '/mount.json');
-		}
-		if (is_file($jsonFile)) {
-			$mountPoints = json_decode(file_get_contents($jsonFile), true);
-			if (is_array($mountPoints)) {
-				return $mountPoints;
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * Get backend dependency message
-	 * TODO: move into AppFramework along with templates
-	 *
-	 * @param Backend[] $backends
-	 * @return string
-	 */
-	public static function dependencyMessage($backends) {
-		$l = \OC::$server->getL10N('files_external');
-		$message = '';
-		$dependencyGroups = [];
-
-		foreach ($backends as $backend) {
-			foreach ($backend->checkDependencies() as $dependency) {
-				if ($message = $dependency->getMessage()) {
-					$message .= '<p>' . $message . '</p>';
-				} else {
-					$dependencyGroups[$dependency->getDependency()][] = $backend;
-				}
-			}
-		}
-
-		foreach ($dependencyGroups as $module => $dependants) {
-			$backends = implode(', ', array_map(function ($backend) {
-				return '"' . $backend->getText() . '"';
-			}, $dependants));
-			$message .= '<p>' . MountConfig::getSingleDependencyMessage($l, $module, $backends) . '</p>';
-		}
-
-		return $message;
-	}
-
-	/**
-	 * Returns a dependency missing message
-	 *
-	 * @param \OCP\IL10N $l
-	 * @param string $module
-	 * @param string $backend
-	 * @return string
-	 */
-	private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) {
-		switch (strtolower($module)) {
-			case 'curl':
-				return $l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]);
-			case 'ftp':
-				return $l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]);
-			default:
-				return $l->t('"%1$s" is not installed. Mounting of %2$s is not possible. Please ask your system administrator to install it.', [$module, $backend]);
-		}
-	}
-
-	/**
-	 * Encrypt passwords in the given config options
-	 *
-	 * @param array $options mount options
-	 * @return array updated options
-	 */
-	public static function encryptPasswords($options) {
-		if (isset($options['password'])) {
-			$options['password_encrypted'] = self::encryptPassword($options['password']);
-			// do not unset the password, we want to keep the keys order
-			// on load... because that's how the UI currently works
-			$options['password'] = '';
-		}
-		return $options;
-	}
-
-	/**
-	 * Decrypt passwords in the given config options
-	 *
-	 * @param array $options mount options
-	 * @return array updated options
-	 */
-	public static function decryptPasswords($options) {
-		// note: legacy options might still have the unencrypted password in the "password" field
-		if (isset($options['password_encrypted'])) {
-			$options['password'] = self::decryptPassword($options['password_encrypted']);
-			unset($options['password_encrypted']);
-		}
-		return $options;
-	}
-
-	/**
-	 * Encrypt a single password
-	 *
-	 * @param string $password plain text password
-	 * @return string encrypted password
-	 */
-	private static function encryptPassword($password) {
-		$cipher = self::getCipher();
-		$iv = \OC::$server->getSecureRandom()->generate(16);
-		$cipher->setIV($iv);
-		return base64_encode($iv . $cipher->encrypt($password));
-	}
-
-	/**
-	 * Decrypts a single password
-	 *
-	 * @param string $encryptedPassword encrypted password
-	 * @return string plain text password
-	 */
-	private static function decryptPassword($encryptedPassword) {
-		$cipher = self::getCipher();
-		$binaryPassword = base64_decode($encryptedPassword);
-		$iv = substr($binaryPassword, 0, 16);
-		$cipher->setIV($iv);
-		$binaryPassword = substr($binaryPassword, 16);
-		return $cipher->decrypt($binaryPassword);
-	}
-
-	/**
-	 * Returns the encryption cipher
-	 *
-	 * @return AES
-	 */
-	private static function getCipher() {
-		$cipher = new AES(AES::MODE_CBC);
-		$cipher->setKey(\OC::$server->getConfig()->getSystemValue('passwordsalt', null));
-		return $cipher;
-	}
-
-	/**
-	 * Computes a hash based on the given configuration.
-	 * This is mostly used to find out whether configurations
-	 * are the same.
-	 *
-	 * @param array $config
-	 * @return string
-	 */
-	public static function makeConfigHash($config) {
-		$data = json_encode(
-			[
-				'c' => $config['backend'],
-				'a' => $config['authMechanism'],
-				'm' => $config['mountpoint'],
-				'o' => $config['options'],
-				'p' => isset($config['priority']) ? $config['priority'] : -1,
-				'mo' => isset($config['mountOptions']) ? $config['mountOptions'] : [],
-			]
-		);
-		return hash('md5', $data);
-	}
+    // TODO: make this class non-static and give it a proper namespace
+
+    public const MOUNT_TYPE_GLOBAL = 'global';
+    public const MOUNT_TYPE_GROUP = 'group';
+    public const MOUNT_TYPE_USER = 'user';
+    public const MOUNT_TYPE_PERSONAL = 'personal';
+
+    // whether to skip backend test (for unit tests, as this static class is not mockable)
+    public static $skipTest = false;
+
+    /** @var Application */
+    public static $app;
+
+    /**
+     * Returns the mount points for the given user.
+     * The mount point is relative to the data directory.
+     *
+     * @param string $uid user
+     * @return array of mount point string as key, mountpoint config as value
+     *
+     * @deprecated 8.2.0 use UserGlobalStoragesService::getStorages() and UserStoragesService::getStorages()
+     */
+    public static function getAbsoluteMountPoints($uid) {
+        $mountPoints = [];
+
+        $userGlobalStoragesService = self::$app->getContainer()->query(UserGlobalStoragesService::class);
+        $userStoragesService = self::$app->getContainer()->query(UserStoragesService::class);
+        $user = self::$app->getContainer()->query(IUserManager::class)->get($uid);
+
+        $userGlobalStoragesService->setUser($user);
+        $userStoragesService->setUser($user);
+
+        foreach ($userGlobalStoragesService->getStorages() as $storage) {
+            /** @var \OCA\Files_External\Lib\StorageConfig $storage */
+            $mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
+            $mountEntry = self::prepareMountPointEntry($storage, false);
+            foreach ($mountEntry['options'] as &$option) {
+                $option = self::substitutePlaceholdersInConfig($option, $uid);
+            }
+            $mountPoints[$mountPoint] = $mountEntry;
+        }
+
+        foreach ($userStoragesService->getStorages() as $storage) {
+            $mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
+            $mountEntry = self::prepareMountPointEntry($storage, true);
+            foreach ($mountEntry['options'] as &$option) {
+                $option = self::substitutePlaceholdersInConfig($option, $uid);
+            }
+            $mountPoints[$mountPoint] = $mountEntry;
+        }
+
+        $userGlobalStoragesService->resetUser();
+        $userStoragesService->resetUser();
+
+        return $mountPoints;
+    }
+
+    /**
+     * Get the system mount points
+     *
+     * @return array
+     *
+     * @deprecated 8.2.0 use GlobalStoragesService::getStorages()
+     */
+    public static function getSystemMountPoints() {
+        $mountPoints = [];
+        $service = self::$app->getContainer()->query(GlobalStoragesService::class);
+
+        foreach ($service->getStorages() as $storage) {
+            $mountPoints[] = self::prepareMountPointEntry($storage, false);
+        }
+
+        return $mountPoints;
+    }
+
+    /**
+     * Convert a StorageConfig to the legacy mountPoints array format
+     * There's a lot of extra information in here, to satisfy all of the legacy functions
+     *
+     * @param StorageConfig $storage
+     * @param bool $isPersonal
+     * @return array
+     */
+    private static function prepareMountPointEntry(StorageConfig $storage, $isPersonal) {
+        $mountEntry = [];
+
+        $mountEntry['mountpoint'] = substr($storage->getMountPoint(), 1); // remove leading slash
+        $mountEntry['class'] = $storage->getBackend()->getIdentifier();
+        $mountEntry['backend'] = $storage->getBackend()->getText();
+        $mountEntry['authMechanism'] = $storage->getAuthMechanism()->getIdentifier();
+        $mountEntry['personal'] = $isPersonal;
+        $mountEntry['options'] = self::decryptPasswords($storage->getBackendOptions());
+        $mountEntry['mountOptions'] = $storage->getMountOptions();
+        $mountEntry['priority'] = $storage->getPriority();
+        $mountEntry['applicable'] = [
+            'groups' => $storage->getApplicableGroups(),
+            'users' => $storage->getApplicableUsers(),
+        ];
+        // if mountpoint is applicable to all users the old API expects ['all']
+        if (empty($mountEntry['applicable']['groups']) && empty($mountEntry['applicable']['users'])) {
+            $mountEntry['applicable']['users'] = ['all'];
+        }
+
+        $mountEntry['id'] = $storage->getId();
+
+        return $mountEntry;
+    }
+
+    /**
+     * @param mixed $input
+     * @param string|null $userId
+     * @return mixed
+     * @throws \OCP\AppFramework\QueryException
+     * @since 16.0.0
+     */
+    public static function substitutePlaceholdersInConfig($input, string $userId = null) {
+        /** @var BackendService $backendService */
+        $backendService = self::$app->getContainer()->query(BackendService::class);
+        /** @var IConfigHandler[] $handlers */
+        $handlers = $backendService->getConfigHandlers();
+        foreach ($handlers as $handler) {
+            if ($handler instanceof UserContext && $userId !== null) {
+                $handler->setUserId($userId);
+            }
+            $input = $handler->handle($input);
+        }
+        return $input;
+    }
+
+    /**
+     * Test connecting using the given backend configuration
+     *
+     * @param string $class backend class name
+     * @param array $options backend configuration options
+     * @param boolean $isPersonal
+     * @return int see self::STATUS_*
+     * @throws Exception
+     */
+    public static function getBackendStatus($class, $options, $isPersonal, $testOnly = true) {
+        if (self::$skipTest) {
+            return StorageNotAvailableException::STATUS_SUCCESS;
+        }
+        foreach ($options as $key => &$option) {
+            if ($key === 'password') {
+                // no replacements in passwords
+                continue;
+            }
+            $option = self::substitutePlaceholdersInConfig($option);
+        }
+        if (class_exists($class)) {
+            try {
+                /** @var \OC\Files\Storage\Common $storage */
+                $storage = new $class($options);
+
+                try {
+                    $result = $storage->test($isPersonal, $testOnly);
+                    $storage->setAvailability($result);
+                    if ($result) {
+                        return StorageNotAvailableException::STATUS_SUCCESS;
+                    }
+                } catch (\Exception $e) {
+                    $storage->setAvailability(false);
+                    throw $e;
+                }
+            } catch (Exception $exception) {
+                \OC::$server->getLogger()->logException($exception, ['app' => 'files_external']);
+                throw $exception;
+            }
+        }
+        return StorageNotAvailableException::STATUS_ERROR;
+    }
+
+    /**
+     * Read the mount points in the config file into an array
+     *
+     * @param string|null $user If not null, personal for $user, otherwise system
+     * @return array
+     */
+    public static function readData($user = null) {
+        if (isset($user)) {
+            $jsonFile = \OC::$server->getUserManager()->get($user)->getHome() . '/mount.json';
+        } else {
+            $config = \OC::$server->getConfig();
+            $datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
+            $jsonFile = $config->getSystemValue('mount_file', $datadir . '/mount.json');
+        }
+        if (is_file($jsonFile)) {
+            $mountPoints = json_decode(file_get_contents($jsonFile), true);
+            if (is_array($mountPoints)) {
+                return $mountPoints;
+            }
+        }
+        return [];
+    }
+
+    /**
+     * Get backend dependency message
+     * TODO: move into AppFramework along with templates
+     *
+     * @param Backend[] $backends
+     * @return string
+     */
+    public static function dependencyMessage($backends) {
+        $l = \OC::$server->getL10N('files_external');
+        $message = '';
+        $dependencyGroups = [];
+
+        foreach ($backends as $backend) {
+            foreach ($backend->checkDependencies() as $dependency) {
+                if ($message = $dependency->getMessage()) {
+                    $message .= '<p>' . $message . '</p>';
+                } else {
+                    $dependencyGroups[$dependency->getDependency()][] = $backend;
+                }
+            }
+        }
+
+        foreach ($dependencyGroups as $module => $dependants) {
+            $backends = implode(', ', array_map(function ($backend) {
+                return '"' . $backend->getText() . '"';
+            }, $dependants));
+            $message .= '<p>' . MountConfig::getSingleDependencyMessage($l, $module, $backends) . '</p>';
+        }
+
+        return $message;
+    }
+
+    /**
+     * Returns a dependency missing message
+     *
+     * @param \OCP\IL10N $l
+     * @param string $module
+     * @param string $backend
+     * @return string
+     */
+    private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) {
+        switch (strtolower($module)) {
+            case 'curl':
+                return $l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]);
+            case 'ftp':
+                return $l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]);
+            default:
+                return $l->t('"%1$s" is not installed. Mounting of %2$s is not possible. Please ask your system administrator to install it.', [$module, $backend]);
+        }
+    }
+
+    /**
+     * Encrypt passwords in the given config options
+     *
+     * @param array $options mount options
+     * @return array updated options
+     */
+    public static function encryptPasswords($options) {
+        if (isset($options['password'])) {
+            $options['password_encrypted'] = self::encryptPassword($options['password']);
+            // do not unset the password, we want to keep the keys order
+            // on load... because that's how the UI currently works
+            $options['password'] = '';
+        }
+        return $options;
+    }
+
+    /**
+     * Decrypt passwords in the given config options
+     *
+     * @param array $options mount options
+     * @return array updated options
+     */
+    public static function decryptPasswords($options) {
+        // note: legacy options might still have the unencrypted password in the "password" field
+        if (isset($options['password_encrypted'])) {
+            $options['password'] = self::decryptPassword($options['password_encrypted']);
+            unset($options['password_encrypted']);
+        }
+        return $options;
+    }
+
+    /**
+     * Encrypt a single password
+     *
+     * @param string $password plain text password
+     * @return string encrypted password
+     */
+    private static function encryptPassword($password) {
+        $cipher = self::getCipher();
+        $iv = \OC::$server->getSecureRandom()->generate(16);
+        $cipher->setIV($iv);
+        return base64_encode($iv . $cipher->encrypt($password));
+    }
+
+    /**
+     * Decrypts a single password
+     *
+     * @param string $encryptedPassword encrypted password
+     * @return string plain text password
+     */
+    private static function decryptPassword($encryptedPassword) {
+        $cipher = self::getCipher();
+        $binaryPassword = base64_decode($encryptedPassword);
+        $iv = substr($binaryPassword, 0, 16);
+        $cipher->setIV($iv);
+        $binaryPassword = substr($binaryPassword, 16);
+        return $cipher->decrypt($binaryPassword);
+    }
+
+    /**
+     * Returns the encryption cipher
+     *
+     * @return AES
+     */
+    private static function getCipher() {
+        $cipher = new AES(AES::MODE_CBC);
+        $cipher->setKey(\OC::$server->getConfig()->getSystemValue('passwordsalt', null));
+        return $cipher;
+    }
+
+    /**
+     * Computes a hash based on the given configuration.
+     * This is mostly used to find out whether configurations
+     * are the same.
+     *
+     * @param array $config
+     * @return string
+     */
+    public static function makeConfigHash($config) {
+        $data = json_encode(
+            [
+                'c' => $config['backend'],
+                'a' => $config['authMechanism'],
+                'm' => $config['mountpoint'],
+                'o' => $config['options'],
+                'p' => isset($config['priority']) ? $config['priority'] : -1,
+                'mo' => isset($config['mountOptions']) ? $config['mountOptions'] : [],
+            ]
+        );
+        return hash('md5', $data);
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -237,11 +237,11 @@ 
 	 */
 	public static function readData($user = null) {
 		if (isset($user)) {
-			$jsonFile = \OC::$server->getUserManager()->get($user)->getHome() . '/mount.json';
+			$jsonFile = \OC::$server->getUserManager()->get($user)->getHome().'/mount.json';
 		} else {
 			$config = \OC::$server->getConfig();
-			$datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
-			$jsonFile = $config->getSystemValue('mount_file', $datadir . '/mount.json');
+			$datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data/');
+			$jsonFile = $config->getSystemValue('mount_file', $datadir.'/mount.json');
 		}
 		if (is_file($jsonFile)) {
 			$mountPoints = json_decode(file_get_contents($jsonFile), true);
@@ -267,7 +267,7 @@ 
 		foreach ($backends as $backend) {
 			foreach ($backend->checkDependencies() as $dependency) {
 				if ($message = $dependency->getMessage()) {
-					$message .= '<p>' . $message . '</p>';
+					$message .= '<p>'.$message.'</p>';
 				} else {
 					$dependencyGroups[$dependency->getDependency()][] = $backend;
 				}
@@ -275,10 +275,10 @@ 
 		}
 
 		foreach ($dependencyGroups as $module => $dependants) {
-			$backends = implode(', ', array_map(function ($backend) {
-				return '"' . $backend->getText() . '"';
+			$backends = implode(', ', array_map(function($backend) {
+				return '"'.$backend->getText().'"';
 			}, $dependants));
-			$message .= '<p>' . MountConfig::getSingleDependencyMessage($l, $module, $backends) . '</p>';
+			$message .= '<p>'.MountConfig::getSingleDependencyMessage($l, $module, $backends).'</p>';
 		}
 
 		return $message;
@@ -344,7 +344,7 @@ 
 		$cipher = self::getCipher();
 		$iv = \OC::$server->getSecureRandom()->generate(16);
 		$cipher->setIV($iv);
-		return base64_encode($iv . $cipher->encrypt($password));
+		return base64_encode($iv.$cipher->encrypt($password));
 	}
 
 	/**

apps/theming/lib/IconBuilder.php

Indentation +206 added lines, -206 removed lines

@@ -32,210 +32,210 @@
 use OCP\Files\SimpleFS\ISimpleFile;
 
 class IconBuilder {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-	/** @var ImageManager */
-	private $imageManager;
-
-	/**
-	 * IconBuilder constructor.
-	 *
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 * @param ImageManager $imageManager
-	 */
-	public function __construct(
-		ThemingDefaults $themingDefaults,
-		Util $util,
-		ImageManager $imageManager
-	) {
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-		$this->imageManager = $imageManager;
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getFavicon($app) {
-		if (!$this->imageManager->shouldReplaceIcons()) {
-			return false;
-		}
-		try {
-			$favicon = new Imagick();
-			$favicon->setFormat("ico");
-			$icon = $this->renderAppIcon($app, 128);
-			if ($icon === false) {
-				return false;
-			}
-			$icon->setImageFormat("png32");
-
-			$clone = clone $icon;
-			$clone->scaleImage(16,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(32,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(64,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(128,0);
-			$favicon->addImage($clone);
-
-			$data = $favicon->getImagesBlob();
-			$favicon->destroy();
-			$icon->destroy();
-			$clone->destroy();
-			return $data;
-		} catch (\ImagickException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getTouchIcon($app) {
-		try {
-			$icon = $this->renderAppIcon($app, 512);
-			if ($icon === false) {
-				return false;
-			}
-			$icon->setImageFormat("png32");
-			$data = $icon->getImageBlob();
-			$icon->destroy();
-			return $data;
-		} catch (\ImagickException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Render app icon on themed background color
-	 * fallback to logo
-	 *
-	 * @param $app string app name
-	 * @param $size int size of the icon in px
-	 * @return Imagick|false
-	 */
-	public function renderAppIcon($app, $size) {
-		$appIcon = $this->util->getAppIcon($app);
-		if ($appIcon === false) {
-			return false;
-		}
-		if ($appIcon instanceof ISimpleFile) {
-			$appIconContent = $appIcon->getContent();
-			$mime = $appIcon->getMimeType();
-		} else {
-			$appIconContent = file_get_contents($appIcon);
-			$mime = mime_content_type($appIcon);
-		}
-
-		if ($appIconContent === false || $appIconContent === "") {
-			return false;
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-
-		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
-			'</svg>';
-		// resize svg magic as this seems broken in Imagemagick
-		if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if (substr($appIconContent, 0, 5) !== "<?xml") {
-				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
-			} else {
-				$svg = $appIconContent;
-			}
-			$tmp = new Imagick();
-			$tmp->readImageBlob($svg);
-			$x = $tmp->getImageWidth();
-			$y = $tmp->getImageHeight();
-			$res = $tmp->getImageResolution();
-			$tmp->destroy();
-
-			if ($x > $y) {
-				$max = $x;
-			} else {
-				$max = $y;
-			}
-
-			// convert svg to resized image
-			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
-			$appIconFile->setResolution($resX, $resY);
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($svg);
-
-			/**
-			 * invert app icons for bright primary colors
-			 * the default nextcloud logo will not be inverted to black
-			 */
-			if ($this->util->invertTextColor($color)
-				&& !$appIcon instanceof ISimpleFile
-				&& $app !== "core"
-			) {
-				$appIconFile->negateImage(false);
-			}
-			$appIconFile->scaleImage(512, 512, true);
-		} else {
-			$appIconFile = new Imagick();
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($appIconContent);
-			$appIconFile->scaleImage(512, 512, true);
-		}
-		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = ($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = ($appIconFile->getImageHeight() - $border_h * 2);
-		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
-		// center icon
-		$offset_w = 512 / 2 - $innerWidth / 2;
-		$offset_h = 512 / 2 - $innerHeight / 2;
-
-		$finalIconFile = new Imagick();
-		$finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-		$finalIconFile->readImageBlob($background);
-		$finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-		$finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
-		$finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
-		$finalIconFile->setImageFormat('png24');
-		if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
-			$filter = Imagick::INTERPOLATE_BICUBIC;
-		} else {
-			$filter = Imagick::FILTER_LANCZOS;
-		}
-		$finalIconFile->resizeImage($size, $size, $filter, 1, false);
-
-		$appIconFile->destroy();
-		return $finalIconFile;
-	}
-
-	public function colorSvg($app, $image) {
-		try {
-			$imageFile = $this->util->getAppImage($app, $image);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-		$svg = file_get_contents($imageFile);
-		if ($svg !== false && $svg !== "") {
-			$color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
-			$svg = $this->util->colorizeSvg($svg, $color);
-			return $svg;
-		} else {
-			return false;
-		}
-	}
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+    /** @var ImageManager */
+    private $imageManager;
+
+    /**
+     * IconBuilder constructor.
+     *
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     * @param ImageManager $imageManager
+     */
+    public function __construct(
+        ThemingDefaults $themingDefaults,
+        Util $util,
+        ImageManager $imageManager
+    ) {
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+        $this->imageManager = $imageManager;
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getFavicon($app) {
+        if (!$this->imageManager->shouldReplaceIcons()) {
+            return false;
+        }
+        try {
+            $favicon = new Imagick();
+            $favicon->setFormat("ico");
+            $icon = $this->renderAppIcon($app, 128);
+            if ($icon === false) {
+                return false;
+            }
+            $icon->setImageFormat("png32");
+
+            $clone = clone $icon;
+            $clone->scaleImage(16,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(32,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(64,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(128,0);
+            $favicon->addImage($clone);
+
+            $data = $favicon->getImagesBlob();
+            $favicon->destroy();
+            $icon->destroy();
+            $clone->destroy();
+            return $data;
+        } catch (\ImagickException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getTouchIcon($app) {
+        try {
+            $icon = $this->renderAppIcon($app, 512);
+            if ($icon === false) {
+                return false;
+            }
+            $icon->setImageFormat("png32");
+            $data = $icon->getImageBlob();
+            $icon->destroy();
+            return $data;
+        } catch (\ImagickException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Render app icon on themed background color
+     * fallback to logo
+     *
+     * @param $app string app name
+     * @param $size int size of the icon in px
+     * @return Imagick|false
+     */
+    public function renderAppIcon($app, $size) {
+        $appIcon = $this->util->getAppIcon($app);
+        if ($appIcon === false) {
+            return false;
+        }
+        if ($appIcon instanceof ISimpleFile) {
+            $appIconContent = $appIcon->getContent();
+            $mime = $appIcon->getMimeType();
+        } else {
+            $appIconContent = file_get_contents($appIcon);
+            $mime = mime_content_type($appIcon);
+        }
+
+        if ($appIconContent === false || $appIconContent === "") {
+            return false;
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+
+        // generate background image with rounded corners
+        $background = '<?xml version="1.0" encoding="UTF-8"?>' .
+            '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
+            '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+            '</svg>';
+        // resize svg magic as this seems broken in Imagemagick
+        if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+            if (substr($appIconContent, 0, 5) !== "<?xml") {
+                $svg = "<?xml version=\"1.0\"?>".$appIconContent;
+            } else {
+                $svg = $appIconContent;
+            }
+            $tmp = new Imagick();
+            $tmp->readImageBlob($svg);
+            $x = $tmp->getImageWidth();
+            $y = $tmp->getImageHeight();
+            $res = $tmp->getImageResolution();
+            $tmp->destroy();
+
+            if ($x > $y) {
+                $max = $x;
+            } else {
+                $max = $y;
+            }
+
+            // convert svg to resized image
+            $appIconFile = new Imagick();
+            $resX = (int)(512 * $res['x'] / $max * 2.53);
+            $resY = (int)(512 * $res['y'] / $max * 2.53);
+            $appIconFile->setResolution($resX, $resY);
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($svg);
+
+            /**
+             * invert app icons for bright primary colors
+             * the default nextcloud logo will not be inverted to black
+             */
+            if ($this->util->invertTextColor($color)
+                && !$appIcon instanceof ISimpleFile
+                && $app !== "core"
+            ) {
+                $appIconFile->negateImage(false);
+            }
+            $appIconFile->scaleImage(512, 512, true);
+        } else {
+            $appIconFile = new Imagick();
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($appIconContent);
+            $appIconFile->scaleImage(512, 512, true);
+        }
+        // offset for icon positioning
+        $border_w = (int)($appIconFile->getImageWidth() * 0.05);
+        $border_h = (int)($appIconFile->getImageHeight() * 0.05);
+        $innerWidth = ($appIconFile->getImageWidth() - $border_w * 2);
+        $innerHeight = ($appIconFile->getImageHeight() - $border_h * 2);
+        $appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
+        // center icon
+        $offset_w = 512 / 2 - $innerWidth / 2;
+        $offset_h = 512 / 2 - $innerHeight / 2;
+
+        $finalIconFile = new Imagick();
+        $finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+        $finalIconFile->readImageBlob($background);
+        $finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
+        $finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
+        $finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
+        $finalIconFile->setImageFormat('png24');
+        if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
+            $filter = Imagick::INTERPOLATE_BICUBIC;
+        } else {
+            $filter = Imagick::FILTER_LANCZOS;
+        }
+        $finalIconFile->resizeImage($size, $size, $filter, 1, false);
+
+        $appIconFile->destroy();
+        return $finalIconFile;
+    }
+
+    public function colorSvg($app, $image) {
+        try {
+            $imageFile = $this->util->getAppImage($app, $image);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+        $svg = file_get_contents($imageFile);
+        if ($svg !== false && $svg !== "") {
+            $color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
+            $svg = $this->util->colorizeSvg($svg, $color);
+            return $svg;
+        } else {
+            return false;
+        }
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -74,19 +74,19 @@ 
 			$icon->setImageFormat("png32");
 
 			$clone = clone $icon;
-			$clone->scaleImage(16,0);
+			$clone->scaleImage(16, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(32,0);
+			$clone->scaleImage(32, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(64,0);
+			$clone->scaleImage(64, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(128,0);
+			$clone->scaleImage(128, 0);
 			$favicon->addImage($clone);
 
 			$data = $favicon->getImagesBlob();
@@ -146,9 +146,9 @@ 
 		$color = $this->themingDefaults->getColorPrimary();
 
 		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+		$background = '<?xml version="1.0" encoding="UTF-8"?>'.
+			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
+			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
 			'</svg>';
 		// resize svg magic as this seems broken in Imagemagick
 		if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
@@ -172,8 +172,8 @@ 
 
 			// convert svg to resized image
 			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
+			$resX = (int) (512 * $res['x'] / $max * 2.53);
+			$resY = (int) (512 * $res['y'] / $max * 2.53);
 			$appIconFile->setResolution($resX, $resY);
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
 			$appIconFile->readImageBlob($svg);
@@ -196,8 +196,8 @@ 
 			$appIconFile->scaleImage(512, 512, true);
 		}
 		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
+		$border_w = (int) ($appIconFile->getImageWidth() * 0.05);
+		$border_h = (int) ($appIconFile->getImageHeight() * 0.05);
 		$innerWidth = ($appIconFile->getImageWidth() - $border_w * 2);
 		$innerHeight = ($appIconFile->getImageHeight() - $border_h * 2);
 		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);

apps/federatedfilesharing/lib/Notifier.php

Indentation +206 added lines, -206 removed lines

@@ -37,237 +37,237 @@
 use OCP\Notification\INotifier;
 
 class Notifier implements INotifier {
-	/** @var IFactory */
-	protected $factory;
-	/** @var IManager */
-	protected $contactsManager;
-	/** @var IURLGenerator */
-	protected $url;
-	/** @var array */
-	protected $federatedContacts;
-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
+    /** @var IFactory */
+    protected $factory;
+    /** @var IManager */
+    protected $contactsManager;
+    /** @var IURLGenerator */
+    protected $url;
+    /** @var array */
+    protected $federatedContacts;
+    /** @var ICloudIdManager */
+    protected $cloudIdManager;
 
-	/**
-	 * @param IFactory $factory
-	 * @param IManager $contactsManager
-	 * @param IURLGenerator $url
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) {
-		$this->factory = $factory;
-		$this->contactsManager = $contactsManager;
-		$this->url = $url;
-		$this->cloudIdManager = $cloudIdManager;
-	}
+    /**
+     * @param IFactory $factory
+     * @param IManager $contactsManager
+     * @param IURLGenerator $url
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) {
+        $this->factory = $factory;
+        $this->contactsManager = $contactsManager;
+        $this->url = $url;
+        $this->cloudIdManager = $cloudIdManager;
+    }
 
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'federatedfilesharing';
-	}
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'federatedfilesharing';
+    }
 
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->factory->get('federatedfilesharing')->t('Federated sharing');
-	}
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->factory->get('federatedfilesharing')->t('Federated sharing');
+    }
 
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'files_sharing' || $notification->getObjectType() !== 'remote_share') {
-			// Not my app => throw
-			throw new \InvalidArgumentException();
-		}
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'files_sharing' || $notification->getObjectType() !== 'remote_share') {
+            // Not my app => throw
+            throw new \InvalidArgumentException();
+        }
 
-		// Read the language from the notification
-		$l = $this->factory->get('files_sharing', $languageCode);
+        // Read the language from the notification
+        $l = $this->factory->get('files_sharing', $languageCode);
 
-		switch ($notification->getSubject()) {
-			// Deal with known subjects
-			case 'remote_share':
-				$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        switch ($notification->getSubject()) {
+            // Deal with known subjects
+            case 'remote_share':
+                $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
 
-				$params = $notification->getSubjectParameters();
-				if ($params[0] !== $params[1] && $params[1] !== null) {
-					$remoteInitiator = $this->createRemoteUser($params[0]);
-					$remoteOwner = $this->createRemoteUser($params[1]);
-					$params[3] = $remoteInitiator['name'] . '@' . $remoteInitiator['server'];
-					$params[4] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
+                $params = $notification->getSubjectParameters();
+                if ($params[0] !== $params[1] && $params[1] !== null) {
+                    $remoteInitiator = $this->createRemoteUser($params[0]);
+                    $remoteOwner = $this->createRemoteUser($params[1]);
+                    $params[3] = $remoteInitiator['name'] . '@' . $remoteInitiator['server'];
+                    $params[4] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
 
-					$notification->setParsedSubject(
-						$l->t('You received "%3$s" as a remote share from %4$s (%1$s) (on behalf of %5$s (%2$s))', $params)
-					);
+                    $notification->setParsedSubject(
+                        $l->t('You received "%3$s" as a remote share from %4$s (%1$s) (on behalf of %5$s (%2$s))', $params)
+                    );
 
-					$notification->setRichSubject(
-						$l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
-						[
-							'share' => [
-								'type' => 'pending-federated-share',
-								'id' => $notification->getObjectId(),
-								'name' => $params[2],
-							],
-							'user' => $remoteInitiator,
-							'behalf' => $remoteOwner,
-						]
-					);
-				} else {
-					$remoteOwner = $this->createRemoteUser($params[0]);
-					$params[3] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
+                    $notification->setRichSubject(
+                        $l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
+                        [
+                            'share' => [
+                                'type' => 'pending-federated-share',
+                                'id' => $notification->getObjectId(),
+                                'name' => $params[2],
+                            ],
+                            'user' => $remoteInitiator,
+                            'behalf' => $remoteOwner,
+                        ]
+                    );
+                } else {
+                    $remoteOwner = $this->createRemoteUser($params[0]);
+                    $params[3] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
 
-					$notification->setParsedSubject(
-						$l->t('You received "%3$s" as a remote share from %4$s (%1$s)', $params)
-					);
+                    $notification->setParsedSubject(
+                        $l->t('You received "%3$s" as a remote share from %4$s (%1$s)', $params)
+                    );
 
 
-					$notification->setRichSubject(
-						$l->t('You received {share} as a remote share from {user}'),
-						[
-							'share' => [
-								'type' => 'pending-federated-share',
-								'id' => $notification->getObjectId(),
-								'name' => $params[2],
-							],
-							'user' => $remoteOwner,
-						]
-					);
-				}
+                    $notification->setRichSubject(
+                        $l->t('You received {share} as a remote share from {user}'),
+                        [
+                            'share' => [
+                                'type' => 'pending-federated-share',
+                                'id' => $notification->getObjectId(),
+                                'name' => $params[2],
+                            ],
+                            'user' => $remoteOwner,
+                        ]
+                    );
+                }
 
-				// Deal with the actions for a known subject
-				foreach ($notification->getActions() as $action) {
-					switch ($action->getLabel()) {
-						case 'accept':
-							$action->setParsedLabel(
-								$l->t('Accept')
-							)
-								->setPrimary(true);
-							break;
+                // Deal with the actions for a known subject
+                foreach ($notification->getActions() as $action) {
+                    switch ($action->getLabel()) {
+                        case 'accept':
+                            $action->setParsedLabel(
+                                $l->t('Accept')
+                            )
+                                ->setPrimary(true);
+                            break;
 
-						case 'decline':
-							$action->setParsedLabel(
-								$l->t('Decline')
-							);
-							break;
-					}
+                        case 'decline':
+                            $action->setParsedLabel(
+                                $l->t('Decline')
+                            );
+                            break;
+                    }
 
-					$notification->addParsedAction($action);
-				}
-				return $notification;
+                    $notification->addParsedAction($action);
+                }
+                return $notification;
 
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new \InvalidArgumentException();
-		}
-	}
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new \InvalidArgumentException();
+        }
+    }
 
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function createRemoteUser($cloudId, $displayName = null) {
-		try {
-			$resolvedId = $this->cloudIdManager->resolveCloudId($cloudId);
-			if ($displayName === null) {
-				$displayName = $this->getDisplayName($resolvedId);
-			}
-			$user = $resolvedId->getUser();
-			$server = $resolvedId->getRemote();
-		} catch (HintException $e) {
-			$user = $cloudId;
-			$displayName = $cloudId;
-			$server = '';
-		}
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function createRemoteUser($cloudId, $displayName = null) {
+        try {
+            $resolvedId = $this->cloudIdManager->resolveCloudId($cloudId);
+            if ($displayName === null) {
+                $displayName = $this->getDisplayName($resolvedId);
+            }
+            $user = $resolvedId->getUser();
+            $server = $resolvedId->getRemote();
+        } catch (HintException $e) {
+            $user = $cloudId;
+            $displayName = $cloudId;
+            $server = '';
+        }
 
-		return [
-			'type' => 'user',
-			'id' => $user,
-			'name' => $displayName,
-			'server' => $server,
-		];
-	}
+        return [
+            'type' => 'user',
+            'id' => $user,
+            'name' => $displayName,
+            'server' => $server,
+        ];
+    }
 
-	/**
-	 * Try to find the user in the contacts
-	 *
-	 * @param ICloudId $cloudId
-	 * @return string
-	 */
-	protected function getDisplayName(ICloudId $cloudId): string {
-		$server = $cloudId->getRemote();
-		$user = $cloudId->getUser();
-		if (strpos($server, 'http://') === 0) {
-			$server = substr($server, strlen('http://'));
-		} elseif (strpos($server, 'https://') === 0) {
-			$server = substr($server, strlen('https://'));
-		}
+    /**
+     * Try to find the user in the contacts
+     *
+     * @param ICloudId $cloudId
+     * @return string
+     */
+    protected function getDisplayName(ICloudId $cloudId): string {
+        $server = $cloudId->getRemote();
+        $user = $cloudId->getUser();
+        if (strpos($server, 'http://') === 0) {
+            $server = substr($server, strlen('http://'));
+        } elseif (strpos($server, 'https://') === 0) {
+            $server = substr($server, strlen('https://'));
+        }
 
-		try {
-			// contains protocol in the  ID
-			return $this->getDisplayNameFromContact($cloudId->getId());
-		} catch (\OutOfBoundsException $e) {
-		}
+        try {
+            // contains protocol in the  ID
+            return $this->getDisplayNameFromContact($cloudId->getId());
+        } catch (\OutOfBoundsException $e) {
+        }
 
-		try {
-			// does not include protocol, as stored in addressbooks
-			return $this->getDisplayNameFromContact($cloudId->getDisplayId());
-		} catch (\OutOfBoundsException $e) {
-		}
+        try {
+            // does not include protocol, as stored in addressbooks
+            return $this->getDisplayNameFromContact($cloudId->getDisplayId());
+        } catch (\OutOfBoundsException $e) {
+        }
 
-		try {
-			return $this->getDisplayNameFromContact($user . '@http://' . $server);
-		} catch (\OutOfBoundsException $e) {
-		}
+        try {
+            return $this->getDisplayNameFromContact($user . '@http://' . $server);
+        } catch (\OutOfBoundsException $e) {
+        }
 
-		try {
-			return $this->getDisplayNameFromContact($user . '@https://' . $server);
-		} catch (\OutOfBoundsException $e) {
-		}
+        try {
+            return $this->getDisplayNameFromContact($user . '@https://' . $server);
+        } catch (\OutOfBoundsException $e) {
+        }
 
-		return $cloudId->getId();
-	}
+        return $cloudId->getId();
+    }
 
-	/**
-	 * Try to find the user in the contacts
-	 *
-	 * @param string $federatedCloudId
-	 * @return string
-	 * @throws \OutOfBoundsException when there is no contact for the id
-	 */
-	protected function getDisplayNameFromContact($federatedCloudId) {
-		if (isset($this->federatedContacts[$federatedCloudId])) {
-			if ($this->federatedContacts[$federatedCloudId] !== '') {
-				return $this->federatedContacts[$federatedCloudId];
-			} else {
-				throw new \OutOfBoundsException('No contact found for federated cloud id');
-			}
-		}
+    /**
+     * Try to find the user in the contacts
+     *
+     * @param string $federatedCloudId
+     * @return string
+     * @throws \OutOfBoundsException when there is no contact for the id
+     */
+    protected function getDisplayNameFromContact($federatedCloudId) {
+        if (isset($this->federatedContacts[$federatedCloudId])) {
+            if ($this->federatedContacts[$federatedCloudId] !== '') {
+                return $this->federatedContacts[$federatedCloudId];
+            } else {
+                throw new \OutOfBoundsException('No contact found for federated cloud id');
+            }
+        }
 
-		$addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
-		foreach ($addressBookEntries as $entry) {
-			if (isset($entry['CLOUD'])) {
-				foreach ($entry['CLOUD'] as $cloudID) {
-					if ($cloudID === $federatedCloudId) {
-						$this->federatedContacts[$federatedCloudId] = $entry['FN'];
-						return $entry['FN'];
-					}
-				}
-			}
-		}
+        $addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
+        foreach ($addressBookEntries as $entry) {
+            if (isset($entry['CLOUD'])) {
+                foreach ($entry['CLOUD'] as $cloudID) {
+                    if ($cloudID === $federatedCloudId) {
+                        $this->federatedContacts[$federatedCloudId] = $entry['FN'];
+                        return $entry['FN'];
+                    }
+                }
+            }
+        }
 
-		$this->federatedContacts[$federatedCloudId] = '';
-		throw new \OutOfBoundsException('No contact found for federated cloud id');
-	}
+        $this->federatedContacts[$federatedCloudId] = '';
+        throw new \OutOfBoundsException('No contact found for federated cloud id');
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -105,8 +105,8 @@ 
 				if ($params[0] !== $params[1] && $params[1] !== null) {
 					$remoteInitiator = $this->createRemoteUser($params[0]);
 					$remoteOwner = $this->createRemoteUser($params[1]);
-					$params[3] = $remoteInitiator['name'] . '@' . $remoteInitiator['server'];
-					$params[4] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
+					$params[3] = $remoteInitiator['name'].'@'.$remoteInitiator['server'];
+					$params[4] = $remoteOwner['name'].'@'.$remoteOwner['server'];
 
 					$notification->setParsedSubject(
 						$l->t('You received "%3$s" as a remote share from %4$s (%1$s) (on behalf of %5$s (%2$s))', $params)
@@ -126,7 +126,7 @@ 
 					);
 				} else {
 					$remoteOwner = $this->createRemoteUser($params[0]);
-					$params[3] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
+					$params[3] = $remoteOwner['name'].'@'.$remoteOwner['server'];
 
 					$notification->setParsedSubject(
 						$l->t('You received "%3$s" as a remote share from %4$s (%1$s)', $params)
@@ -227,12 +227,12 @@ 
 		}
 
 		try {
-			return $this->getDisplayNameFromContact($user . '@http://' . $server);
+			return $this->getDisplayNameFromContact($user.'@http://'.$server);
 		} catch (\OutOfBoundsException $e) {
 		}
 
 		try {
-			return $this->getDisplayNameFromContact($user . '@https://' . $server);
+			return $this->getDisplayNameFromContact($user.'@https://'.$server);
 		} catch (\OutOfBoundsException $e) {
 		}
 

apps/files/lib/Controller/ApiController.php

Indentation +267 added lines, -267 removed lines

@@ -61,286 +61,286 @@
  * @package OCA\Files\Controller
  */
 class ApiController extends Controller {
-	/** @var TagService */
-	private $tagService;
-	/** @var IManager * */
-	private $shareManager;
-	/** @var IPreview */
-	private $previewManager;
-	/** IUserSession */
-	private $userSession;
-	/** IConfig */
-	private $config;
-	/** @var Folder */
-	private $userFolder;
+    /** @var TagService */
+    private $tagService;
+    /** @var IManager * */
+    private $shareManager;
+    /** @var IPreview */
+    private $previewManager;
+    /** IUserSession */
+    private $userSession;
+    /** IConfig */
+    private $config;
+    /** @var Folder */
+    private $userFolder;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserSession $userSession
-	 * @param TagService $tagService
-	 * @param IPreview $previewManager
-	 * @param IManager $shareManager
-	 * @param IConfig $config
-	 * @param Folder $userFolder
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IUserSession $userSession,
-								TagService $tagService,
-								IPreview $previewManager,
-								IManager $shareManager,
-								IConfig $config,
-								Folder $userFolder) {
-		parent::__construct($appName, $request);
-		$this->userSession = $userSession;
-		$this->tagService = $tagService;
-		$this->previewManager = $previewManager;
-		$this->shareManager = $shareManager;
-		$this->config = $config;
-		$this->userFolder = $userFolder;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserSession $userSession
+     * @param TagService $tagService
+     * @param IPreview $previewManager
+     * @param IManager $shareManager
+     * @param IConfig $config
+     * @param Folder $userFolder
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IUserSession $userSession,
+                                TagService $tagService,
+                                IPreview $previewManager,
+                                IManager $shareManager,
+                                IConfig $config,
+                                Folder $userFolder) {
+        parent::__construct($appName, $request);
+        $this->userSession = $userSession;
+        $this->tagService = $tagService;
+        $this->previewManager = $previewManager;
+        $this->shareManager = $shareManager;
+        $this->config = $config;
+        $this->userFolder = $userFolder;
+    }
 
-	/**
-	 * Gets a thumbnail of the specified file
-	 *
-	 * @since API version 1.0
-	 *
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @StrictCookieRequired
-	 *
-	 * @param int $x
-	 * @param int $y
-	 * @param string $file URL-encoded filename
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getThumbnail($x, $y, $file) {
-		if ($x < 1 || $y < 1) {
-			return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * Gets a thumbnail of the specified file
+     *
+     * @since API version 1.0
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @StrictCookieRequired
+     *
+     * @param int $x
+     * @param int $y
+     * @param string $file URL-encoded filename
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getThumbnail($x, $y, $file) {
+        if ($x < 1 || $y < 1) {
+            return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$file = $this->userFolder->get($file);
-			if ($file instanceof Folder) {
-				throw new NotFoundException();
-			}
+        try {
+            $file = $this->userFolder->get($file);
+            if ($file instanceof Folder) {
+                throw new NotFoundException();
+            }
 
-			/** @var File $file */
-			$preview = $this->previewManager->getPreview($file, $x, $y, true);
+            /** @var File $file */
+            $preview = $this->previewManager->getPreview($file, $x, $y, true);
 
-			return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND);
-		} catch (\Exception $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+            return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND);
+        } catch (\Exception $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 
-	/**
-	 * Updates the info of the specified file path
-	 * The passed tags are absolute, which means they will
-	 * replace the actual tag selection.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $path path
-	 * @param array|string $tags array of tags
-	 * @return DataResponse
-	 */
-	public function updateFileTags($path, $tags = null) {
-		$result = [];
-		// if tags specified or empty array, update tags
-		if (!is_null($tags)) {
-			try {
-				$this->tagService->updateFileTags($path, $tags);
-			} catch (\OCP\Files\NotFoundException $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_NOT_FOUND);
-			} catch (\OCP\Files\StorageNotAvailableException $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_SERVICE_UNAVAILABLE);
-			} catch (\Exception $e) {
-				return new DataResponse([
-					'message' => $e->getMessage()
-				], Http::STATUS_NOT_FOUND);
-			}
-			$result['tags'] = $tags;
-		}
-		return new DataResponse($result);
-	}
+    /**
+     * Updates the info of the specified file path
+     * The passed tags are absolute, which means they will
+     * replace the actual tag selection.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $path path
+     * @param array|string $tags array of tags
+     * @return DataResponse
+     */
+    public function updateFileTags($path, $tags = null) {
+        $result = [];
+        // if tags specified or empty array, update tags
+        if (!is_null($tags)) {
+            try {
+                $this->tagService->updateFileTags($path, $tags);
+            } catch (\OCP\Files\NotFoundException $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_NOT_FOUND);
+            } catch (\OCP\Files\StorageNotAvailableException $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_SERVICE_UNAVAILABLE);
+            } catch (\Exception $e) {
+                return new DataResponse([
+                    'message' => $e->getMessage()
+                ], Http::STATUS_NOT_FOUND);
+            }
+            $result['tags'] = $tags;
+        }
+        return new DataResponse($result);
+    }
 
-	/**
-	 * @param \OCP\Files\Node[] $nodes
-	 * @return array
-	 */
-	private function formatNodes(array $nodes) {
-		return array_values(array_map(function (Node $node) {
-			/** @var \OC\Files\Node\Node $shareTypes */
-			$shareTypes = $this->getShareTypes($node);
-			$file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
-			$file['hasPreview'] = $this->previewManager->isAvailable($node);
-			$parts = explode('/', dirname($node->getPath()), 4);
-			if (isset($parts[3])) {
-				$file['path'] = '/' . $parts[3];
-			} else {
-				$file['path'] = '/';
-			}
-			if (!empty($shareTypes)) {
-				$file['shareTypes'] = $shareTypes;
-			}
-			return $file;
-		}, $nodes));
-	}
+    /**
+     * @param \OCP\Files\Node[] $nodes
+     * @return array
+     */
+    private function formatNodes(array $nodes) {
+        return array_values(array_map(function (Node $node) {
+            /** @var \OC\Files\Node\Node $shareTypes */
+            $shareTypes = $this->getShareTypes($node);
+            $file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
+            $file['hasPreview'] = $this->previewManager->isAvailable($node);
+            $parts = explode('/', dirname($node->getPath()), 4);
+            if (isset($parts[3])) {
+                $file['path'] = '/' . $parts[3];
+            } else {
+                $file['path'] = '/';
+            }
+            if (!empty($shareTypes)) {
+                $file['shareTypes'] = $shareTypes;
+            }
+            return $file;
+        }, $nodes));
+    }
 
-	/**
-	 * Returns a list of recently modifed files.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function getRecentFiles() {
-		$nodes = $this->userFolder->getRecent(100);
-		$files = $this->formatNodes($nodes);
-		return new DataResponse(['files' => $files]);
-	}
+    /**
+     * Returns a list of recently modifed files.
+     *
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function getRecentFiles() {
+        $nodes = $this->userFolder->getRecent(100);
+        $files = $this->formatNodes($nodes);
+        return new DataResponse(['files' => $files]);
+    }
 
-	/**
-	 * Return a list of share types for outgoing shares
-	 *
-	 * @param Node $node file node
-	 *
-	 * @return int[] array of share types
-	 */
-	private function getShareTypes(Node $node) {
-		$userId = $this->userSession->getUser()->getUID();
-		$shareTypes = [];
-		$requestedShareTypes = [
-			IShare::TYPE_USER,
-			IShare::TYPE_GROUP,
-			IShare::TYPE_LINK,
-			IShare::TYPE_REMOTE,
-			IShare::TYPE_EMAIL,
-			IShare::TYPE_ROOM,
-			IShare::TYPE_DECK,
-		];
-		foreach ($requestedShareTypes as $requestedShareType) {
-			// one of each type is enough to find out about the types
-			$shares = $this->shareManager->getSharesBy(
-				$userId,
-				$requestedShareType,
-				$node,
-				false,
-				1
-			);
-			if (!empty($shares)) {
-				$shareTypes[] = $requestedShareType;
-			}
-		}
-		return $shareTypes;
-	}
+    /**
+     * Return a list of share types for outgoing shares
+     *
+     * @param Node $node file node
+     *
+     * @return int[] array of share types
+     */
+    private function getShareTypes(Node $node) {
+        $userId = $this->userSession->getUser()->getUID();
+        $shareTypes = [];
+        $requestedShareTypes = [
+            IShare::TYPE_USER,
+            IShare::TYPE_GROUP,
+            IShare::TYPE_LINK,
+            IShare::TYPE_REMOTE,
+            IShare::TYPE_EMAIL,
+            IShare::TYPE_ROOM,
+            IShare::TYPE_DECK,
+        ];
+        foreach ($requestedShareTypes as $requestedShareType) {
+            // one of each type is enough to find out about the types
+            $shares = $this->shareManager->getSharesBy(
+                $userId,
+                $requestedShareType,
+                $node,
+                false,
+                1
+            );
+            if (!empty($shares)) {
+                $shareTypes[] = $requestedShareType;
+            }
+        }
+        return $shareTypes;
+    }
 
-	/**
-	 * Change the default sort mode
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $mode
-	 * @param string $direction
-	 * @return Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function updateFileSorting($mode, $direction) {
-		$allowedMode = ['name', 'size', 'mtime'];
-		$allowedDirection = ['asc', 'desc'];
-		if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) {
-			$response = new Response();
-			$response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
-			return $response;
-		}
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode);
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction);
-		return new Response();
-	}
+    /**
+     * Change the default sort mode
+     *
+     * @NoAdminRequired
+     *
+     * @param string $mode
+     * @param string $direction
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function updateFileSorting($mode, $direction) {
+        $allowedMode = ['name', 'size', 'mtime'];
+        $allowedDirection = ['asc', 'desc'];
+        if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) {
+            $response = new Response();
+            $response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
+            return $response;
+        }
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode);
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction);
+        return new Response();
+    }
 
-	/**
-	 * Toggle default for showing/hiding hidden files
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $show
-	 * @return Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function showHiddenFiles($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int)$show);
-		return new Response();
-	}
+    /**
+     * Toggle default for showing/hiding hidden files
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $show
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function showHiddenFiles($show) {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int)$show);
+        return new Response();
+    }
 
-	/**
-	 * Toggle default for files grid view
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param bool $show
-	 * @return Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function showGridView($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', (int)$show);
-		return new Response();
-	}
+    /**
+     * Toggle default for files grid view
+     *
+     * @NoAdminRequired
+     *
+     * @param bool $show
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function showGridView($show) {
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', (int)$show);
+        return new Response();
+    }
 
-	/**
-	 * Get default settings for the grid view
-	 *
-	 * @NoAdminRequired
-	 */
-	public function getGridView() {
-		$status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '0') === '1';
-		return new JSONResponse(['gridview' => $status]);
-	}
+    /**
+     * Get default settings for the grid view
+     *
+     * @NoAdminRequired
+     */
+    public function getGridView() {
+        $status = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', '0') === '1';
+        return new JSONResponse(['gridview' => $status]);
+    }
 
-	/**
-	 * Toggle default for showing/hiding xxx folder
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param int $show
-	 * @param string $key the key of the folder
-	 *
-	 * @return Response
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function toggleShowFolder(int $show, string $key) {
-		// ensure the edited key exists
-		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
-		foreach ($navItems as $item) {
-			// check if data is valid
-			if (($show === 0 || $show === 1) && isset($item['expandedState']) && $key === $item['expandedState']) {
-				$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', $key, $show);
-				return new Response();
-			}
-		}
-		$response = new Response();
-		$response->setStatus(Http::STATUS_FORBIDDEN);
-		return $response;
-	}
+    /**
+     * Toggle default for showing/hiding xxx folder
+     *
+     * @NoAdminRequired
+     *
+     * @param int $show
+     * @param string $key the key of the folder
+     *
+     * @return Response
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function toggleShowFolder(int $show, string $key) {
+        // ensure the edited key exists
+        $navItems = \OCA\Files\App::getNavigationManager()->getAll();
+        foreach ($navItems as $item) {
+            // check if data is valid
+            if (($show === 0 || $show === 1) && isset($item['expandedState']) && $key === $item['expandedState']) {
+                $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', $key, $show);
+                return new Response();
+            }
+        }
+        $response = new Response();
+        $response->setStatus(Http::STATUS_FORBIDDEN);
+        return $response;
+    }
 
-	/**
-	 * Get sorting-order for custom sorting
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $folderpath
-	 * @return string
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getNodeType($folderpath) {
-		$node = $this->userFolder->get($folderpath);
-		return $node->getType();
-	}
+    /**
+     * Get sorting-order for custom sorting
+     *
+     * @NoAdminRequired
+     *
+     * @param string $folderpath
+     * @return string
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getNodeType($folderpath) {
+        $node = $this->userFolder->get($folderpath);
+        return $node->getType();
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -177,14 +177,14 @@ 
 	 * @return array
 	 */
 	private function formatNodes(array $nodes) {
-		return array_values(array_map(function (Node $node) {
+		return array_values(array_map(function(Node $node) {
 			/** @var \OC\Files\Node\Node $shareTypes */
 			$shareTypes = $this->getShareTypes($node);
 			$file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
 			$file['hasPreview'] = $this->previewManager->isAvailable($node);
 			$parts = explode('/', dirname($node->getPath()), 4);
 			if (isset($parts[3])) {
-				$file['path'] = '/' . $parts[3];
+				$file['path'] = '/'.$parts[3];
 			} else {
 				$file['path'] = '/';
 			}
@@ -276,7 +276,7 @@ 
 	 * @throws \OCP\PreConditionNotMetException
 	 */
 	public function showHiddenFiles($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int)$show);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int) $show);
 		return new Response();
 	}
 
@@ -290,7 +290,7 @@ 
 	 * @throws \OCP\PreConditionNotMetException
 	 */
 	public function showGridView($show) {
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', (int)$show);
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_grid', (int) $show);
 		return new Response();
 	}
 

apps/federation/lib/Controller/SettingsController.php

Indentation +76 added lines, -76 removed lines

@@ -33,90 +33,90 @@
 
 class SettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var  TrustedServers */
-	private $trustedServers;
+    /** @var  TrustedServers */
+    private $trustedServers;
 
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param TrustedServers $trustedServers
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								TrustedServers $trustedServers
-	) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->trustedServers = $trustedServers;
-	}
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param TrustedServers $trustedServers
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                TrustedServers $trustedServers
+    ) {
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->trustedServers = $trustedServers;
+    }
 
 
-	/**
-	 * add server to the list of trusted Nextclouds
-	 *
-	 * @param string $url
-	 * @return DataResponse
-	 * @throws HintException
-	 */
-	public function addServer($url) {
-		$this->checkServer($url);
-		$id = $this->trustedServers->addServer($url);
+    /**
+     * add server to the list of trusted Nextclouds
+     *
+     * @param string $url
+     * @return DataResponse
+     * @throws HintException
+     */
+    public function addServer($url) {
+        $this->checkServer($url);
+        $id = $this->trustedServers->addServer($url);
 
-		return new DataResponse(
-			[
-				'url' => $url,
-				'id' => $id,
-				'message' => $this->l->t('Added to the list of trusted servers')
-			]
-		);
-	}
+        return new DataResponse(
+            [
+                'url' => $url,
+                'id' => $id,
+                'message' => $this->l->t('Added to the list of trusted servers')
+            ]
+        );
+    }
 
-	/**
-	 * add server to the list of trusted Nextclouds
-	 *
-	 * @param int $id
-	 * @return DataResponse
-	 */
-	public function removeServer($id) {
-		$this->trustedServers->removeServer($id);
-		return new DataResponse();
-	}
+    /**
+     * add server to the list of trusted Nextclouds
+     *
+     * @param int $id
+     * @return DataResponse
+     */
+    public function removeServer($id) {
+        $this->trustedServers->removeServer($id);
+        return new DataResponse();
+    }
 
-	/**
-	 * enable/disable to automatically add servers to the list of trusted servers
-	 * once a federated share was created and accepted successfully
-	 *
-	 * @param bool $autoAddServers
-	 */
-	public function autoAddServers($autoAddServers) {
-		$this->trustedServers->setAutoAddServers($autoAddServers);
-	}
+    /**
+     * enable/disable to automatically add servers to the list of trusted servers
+     * once a federated share was created and accepted successfully
+     *
+     * @param bool $autoAddServers
+     */
+    public function autoAddServers($autoAddServers) {
+        $this->trustedServers->setAutoAddServers($autoAddServers);
+    }
 
-	/**
-	 * check if the server should be added to the list of trusted servers or not
-	 *
-	 * @param string $url
-	 * @return bool
-	 * @throws HintException
-	 */
-	protected function checkServer($url) {
-		if ($this->trustedServers->isTrustedServer($url) === true) {
-			$message = 'Server is already in the list of trusted servers.';
-			$hint = $this->l->t('Server is already in the list of trusted servers.');
-			throw new HintException($message, $hint);
-		}
+    /**
+     * check if the server should be added to the list of trusted servers or not
+     *
+     * @param string $url
+     * @return bool
+     * @throws HintException
+     */
+    protected function checkServer($url) {
+        if ($this->trustedServers->isTrustedServer($url) === true) {
+            $message = 'Server is already in the list of trusted servers.';
+            $hint = $this->l->t('Server is already in the list of trusted servers.');
+            throw new HintException($message, $hint);
+        }
 
-		if ($this->trustedServers->isOwnCloudServer($url) === false) {
-			$message = 'No server to federate with found';
-			$hint = $this->l->t('No server to federate with found');
-			throw new HintException($message, $hint);
-		}
+        if ($this->trustedServers->isOwnCloudServer($url) === false) {
+            $message = 'No server to federate with found';
+            $hint = $this->l->t('No server to federate with found');
+            throw new HintException($message, $hint);
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/sharebymail/lib/Activity.php

Indentation +352 added lines, -352 removed lines

@@ -38,356 +38,356 @@
 
 class Activity implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IContactsManager */
-	protected $contactsManager;
-
-	/** @var array */
-	protected $displayNames = [];
-
-	/** @var array */
-	protected $contactNames = [];
-
-	public const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
-	public const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
-	public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send';
-	public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self';
-	public const SUBJECT_UNSHARED_EMAIL_SELF = 'unshared_with_email_self';
-	public const SUBJECT_UNSHARED_EMAIL_BY = 'unshared_with_email_by';
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IContactsManager $contactsManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->contactsManager = $contactsManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'sharebymail') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('sharebymail', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('Shared with %1$s', [
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('Shared with {email}'), [
-					'email' => $parsedParameters['email'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
-					'email' => $parsedParameters['email'],
-					'actor' => $parsedParameters['actor'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('Unshared from %1$s', [
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('Unshared from {email}'), [
-					'email' => $parsedParameters['email'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('Unshared from %1$s by %2$s', [
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('Unshared from {email} by {actor}'), [
-					'email' => $parsedParameters['email'],
-					'actor' => $parsedParameters['actor'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
-			$event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
-				$parsedParameters['email']['name']
-			]))
-				->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
-					'email' => $parsedParameters['email']
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
-			$event->setParsedSubject($this->l->t('Password for mail share sent to you'))
-				->setRichSubject($this->l->t('Password for mail share sent to you'));
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('You unshared %1$s from %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('You unshared {file} from {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('%3$s unshared %1$s from %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('{actor} unshared {file} from {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
-			$event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name']
-			]))
-				->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
-			$event->setParsedSubject(
-				$this->l->t('Password to access %1$s was sent to you',
-					[$parsedParameters['file']['path']]))
-				->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_SHARED_EMAIL_SELF:
-			case self::SUBJECT_UNSHARED_EMAIL_SELF:
-				return [
-					'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_BY:
-			case self::SUBJECT_UNSHARED_EMAIL_BY:
-				return [
-					'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND:
-				return [
-					'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF:
-				return [
-					'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
-				];
-		}
-		throw new \InvalidArgumentException();
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $path
-	 * @return array
-	 */
-	protected function generateFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $email
-	 * @return array
-	 */
-	protected function generateEmailParameter($email) {
-		if (!isset($this->contactNames[$email])) {
-			$this->contactNames[$email] = $this->getContactName($email);
-		}
-
-		return [
-			'type' => 'email',
-			'id' => $email,
-			'name' => $this->contactNames[$email],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $email
-	 * @return string
-	 */
-	protected function getContactName($email) {
-		$addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
-
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-
-			if (in_array($email, $contact['EMAIL'])) {
-				return $contact['FN'];
-			}
-		}
-
-		return $email;
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IContactsManager */
+    protected $contactsManager;
+
+    /** @var array */
+    protected $displayNames = [];
+
+    /** @var array */
+    protected $contactNames = [];
+
+    public const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
+    public const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
+    public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send';
+    public const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self';
+    public const SUBJECT_UNSHARED_EMAIL_SELF = 'unshared_with_email_self';
+    public const SUBJECT_UNSHARED_EMAIL_BY = 'unshared_with_email_by';
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IContactsManager $contactsManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->contactsManager = $contactsManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'sharebymail') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('sharebymail', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('Shared with %1$s', [
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Shared with {email}'), [
+                    'email' => $parsedParameters['email'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
+                    'email' => $parsedParameters['email'],
+                    'actor' => $parsedParameters['actor'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('Unshared from %1$s', [
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Unshared from {email}'), [
+                    'email' => $parsedParameters['email'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('Unshared from %1$s by %2$s', [
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Unshared from {email} by {actor}'), [
+                    'email' => $parsedParameters['email'],
+                    'actor' => $parsedParameters['actor'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
+            $event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
+                $parsedParameters['email']['name']
+            ]))
+                ->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
+                    'email' => $parsedParameters['email']
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
+            $event->setParsedSubject($this->l->t('Password for mail share sent to you'))
+                ->setRichSubject($this->l->t('Password for mail share sent to you'));
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('You unshared %1$s from %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('You unshared {file} from {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('%3$s unshared %1$s from %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('{actor} unshared {file} from {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
+            $event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name']
+            ]))
+                ->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
+            $event->setParsedSubject(
+                $this->l->t('Password to access %1$s was sent to you',
+                    [$parsedParameters['file']['path']]))
+                ->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_SHARED_EMAIL_SELF:
+            case self::SUBJECT_UNSHARED_EMAIL_SELF:
+                return [
+                    'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_BY:
+            case self::SUBJECT_UNSHARED_EMAIL_BY:
+                return [
+                    'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND:
+                return [
+                    'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF:
+                return [
+                    'file' => $this->generateFileParameter($event->getObjectId(), $parameters[0]),
+                ];
+        }
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * @param int $id
+     * @param string $path
+     * @return array
+     */
+    protected function generateFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $email
+     * @return array
+     */
+    protected function generateEmailParameter($email) {
+        if (!isset($this->contactNames[$email])) {
+            $this->contactNames[$email] = $this->getContactName($email);
+        }
+
+        return [
+            'type' => 'email',
+            'id' => $email,
+            'name' => $this->contactNames[$email],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $email
+     * @return string
+     */
+    protected function getContactName($email) {
+        $addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
+
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+
+            if (in_array($email, $contact['EMAIL'])) {
+                return $contact['FN'];
+            }
+        }
+
+        return $email;
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }