nextcloud / server

apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 		try {
 			$this->activityManager->publish($activity);
 		} catch (BadMethodCallException $e) {
-			$this->logger->warning('Could not publish activity: ' . $e->getMessage(), [
+			$this->logger->warning('Could not publish activity: '.$e->getMessage(), [
 				'exception' => $e
 			]);
 		}

Indentation +25 added lines, -25 removed lines

@@ -21,32 +21,32 @@
  * @template-implements IEventListener<\OC\Authentication\Events\AppPasswordCreatedEvent>
  */
 class AppPasswordCreatedActivityListener implements IEventListener {
-	public function __construct(
-		private IActivityManager $activityManager,
-		private IUserSession $userSession,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IActivityManager $activityManager,
+        private IUserSession $userSession,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof AppPasswordCreatedEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof AppPasswordCreatedEvent)) {
+            return;
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('settings')
-			->setType('security')
-			->setAffectedUser($event->getToken()->getUID())
-			->setAuthor($this->userSession->getUser() ? $this->userSession->getUser()->getUID() : '')
-			->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $event->getToken()->getName()])
-			->setObject('app_token', $event->getToken()->getId());
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('settings')
+            ->setType('security')
+            ->setAffectedUser($event->getToken()->getUID())
+            ->setAuthor($this->userSession->getUser() ? $this->userSession->getUser()->getUID() : '')
+            ->setSubject(Provider::APP_TOKEN_CREATED, ['name' => $event->getToken()->getName()])
+            ->setObject('app_token', $event->getToken()->getId());
 
-		try {
-			$this->activityManager->publish($activity);
-		} catch (BadMethodCallException $e) {
-			$this->logger->warning('Could not publish activity: ' . $e->getMessage(), [
-				'exception' => $e
-			]);
-		}
-	}
+        try {
+            $this->activityManager->publish($activity);
+        } catch (BadMethodCallException $e) {
+            $this->logger->warning('Could not publish activity: ' . $e->getMessage(), [
+                'exception' => $e
+            ]);
+        }
+    }
 }

apps/files_external/lib/Service/DBConfigService.php

Spacing +13 added lines, -13 removed lines

@@ -140,7 +140,7 @@ 
 		$stmt->closeCursor();
 
 		foreach ($result as $row) {
-			if ((int)$row['count'] > 1) {
+			if ((int) $row['count'] > 1) {
 				$this->removeApplicable($row['mount_id'], $applicableType, $applicableId);
 			} else {
 				$this->removeMount($row['mount_id']);
@@ -214,7 +214,7 @@ 
 	 */
 	public function getAdminMountsForMultiple($type, array $values) {
 		$builder = $this->connection->getQueryBuilder();
-		$params = array_map(function ($value) use ($builder) {
+		$params = array_map(function($value) use ($builder) {
 			return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR);
 		}, $values);
 
@@ -412,7 +412,7 @@ 
 		}
 		$uniqueMounts = array_values($uniqueMounts);
 
-		$mountIds = array_map(function ($mount) {
+		$mountIds = array_map(function($mount) {
 			return $mount['mount_id'];
 		}, $uniqueMounts);
 		$mountIds = array_values(array_unique($mountIds));
@@ -421,9 +421,9 @@ 
 		$config = $this->getConfigForMounts($mountIds);
 		$options = $this->getOptionsForMounts($mountIds);
 
-		return array_map(function ($mount, $applicable, $config, $options) {
-			$mount['type'] = (int)$mount['type'];
-			$mount['priority'] = (int)$mount['priority'];
+		return array_map(function($mount, $applicable, $config, $options) {
+			$mount['type'] = (int) $mount['type'];
+			$mount['priority'] = (int) $mount['priority'];
 			$mount['applicable'] = $applicable;
 			$mount['config'] = $config;
 			$mount['options'] = $options;
@@ -445,7 +445,7 @@ 
 		}
 		$builder = $this->connection->getQueryBuilder();
 		$fields[] = 'mount_id';
-		$placeHolders = array_map(function ($id) use ($builder) {
+		$placeHolders = array_map(function($id) use ($builder) {
 			return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT);
 		}, $mountIds);
 		$query = $builder->select($fields)
@@ -462,7 +462,7 @@ 
 		}
 		foreach ($rows as $row) {
 			if (isset($row['type'])) {
-				$row['type'] = (int)$row['type'];
+				$row['type'] = (int) $row['type'];
 			}
 			$result[$row['mount_id']][] = $row;
 		}
@@ -493,8 +493,8 @@ 
 	public function getOptionsForMounts($mountIds) {
 		$mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds);
 		$optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions);
-		return array_map(function (array $options) {
-			return array_map(function ($option) {
+		return array_map(function(array $options) {
+			return array_map(function($option) {
 				return json_decode($option);
 			}, $options);
 		}, $optionsMap);
@@ -505,16 +505,16 @@ 
 	 * @return array ['key1' => $value1, ...]
 	 */
 	private function createKeyValueMap(array $keyValuePairs) {
-		$decryptedPairts = array_map(function ($pair) {
+		$decryptedPairts = array_map(function($pair) {
 			if ($pair['key'] === 'password') {
 				$pair['value'] = $this->decryptValue($pair['value']);
 			}
 			return $pair;
 		}, $keyValuePairs);
-		$keys = array_map(function ($pair) {
+		$keys = array_map(function($pair) {
 			return $pair['key'];
 		}, $decryptedPairts);
-		$values = array_map(function ($pair) {
+		$values = array_map(function($pair) {
 			return $pair['value'];
 		}, $decryptedPairts);
 

Indentation +504 added lines, -504 removed lines

@@ -17,508 +17,508 @@
  * Stores the mount config in the database
  */
 class DBConfigService {
-	public const MOUNT_TYPE_ADMIN = 1;
-	public const MOUNT_TYPE_PERSONAL = 2;
-	/** @deprecated use MOUNT_TYPE_PERSONAL (full uppercase) instead */
-	public const MOUNT_TYPE_PERSONAl = 2;
-
-	public const APPLICABLE_TYPE_GLOBAL = 1;
-	public const APPLICABLE_TYPE_GROUP = 2;
-	public const APPLICABLE_TYPE_USER = 3;
-
-	public function __construct(
-		private IDBConnection $connection,
-		private ICrypto $crypto,
-	) {
-	}
-
-	public function getMountById(int $mountId): ?array {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts', 'm')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$mounts = $this->getMountsFromQuery($query);
-		if (count($mounts) > 0) {
-			return $mounts[0];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get all configured mounts
-	 *
-	 * @return array
-	 */
-	public function getAllMounts() {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts');
-		return $this->getMountsFromQuery($query);
-	}
-
-	public function getMountsForUser($userId, $groupIds) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->orX(
-				$builder->expr()->andX( // global mounts
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GLOBAL, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->isNull('a.value'),
-				),
-				$builder->expr()->andX( // mounts for user
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_USER, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->eq('a.value', $builder->createNamedParameter($userId)),
-				),
-				$builder->expr()->andX( // mounts for group
-					$builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GROUP, IQueryBuilder::PARAM_INT)),
-					$builder->expr()->in('a.value', $builder->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)),
-				),
-			));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	public function modifyMountsOnUserDelete(string $uid): void {
-		$this->modifyMountsOnDelete($uid, self::APPLICABLE_TYPE_USER);
-	}
-
-	public function modifyMountsOnGroupDelete(string $gid): void {
-		$this->modifyMountsOnDelete($gid, self::APPLICABLE_TYPE_GROUP);
-	}
-
-	protected function modifyMountsOnDelete(string $applicableId, int $applicableType): void {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['a.mount_id', $builder->func()->count('a.mount_id', 'count')])
-			->from('external_applicable', 'a')
-			->leftJoin('a', 'external_applicable', 'b', $builder->expr()->eq('a.mount_id', 'b.mount_id'))
-			->where($builder->expr()->andX(
-				$builder->expr()->eq('b.type', $builder->createNamedParameter($applicableType, IQueryBuilder::PARAM_INT)),
-				$builder->expr()->eq('b.value', $builder->createNamedParameter($applicableId)),
-			),
-			)
-			->groupBy(['a.mount_id']);
-		$stmt = $query->executeQuery();
-		$result = $stmt->fetchAll();
-		$stmt->closeCursor();
-
-		foreach ($result as $row) {
-			if ((int)$row['count'] > 1) {
-				$this->removeApplicable($row['mount_id'], $applicableType, $applicableId);
-			} else {
-				$this->removeMount($row['mount_id']);
-			}
-		}
-	}
-
-	/**
-	 * Get admin defined mounts
-	 *
-	 * @return array
-	 */
-	public function getAdminMounts() {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
-			->from('external_mounts')
-			->where($builder->expr()->eq('type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-		return $this->getMountsFromQuery($query);
-	}
-
-	protected function getForQuery(IQueryBuilder $builder, $type, $value) {
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
-
-		if (is_null($value)) {
-			$query = $query->andWhere($builder->expr()->isNull('a.value'));
-		} else {
-			$query = $query->andWhere($builder->expr()->eq('a.value', $builder->createNamedParameter($value)));
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get admin defined mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getAdminMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get admin defined mounts for multiple applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string[] $values user_ids or group_ids
-	 * @return array
-	 */
-	public function getAdminMountsForMultiple($type, array $values) {
-		$builder = $this->connection->getQueryBuilder();
-		$params = array_map(function ($value) use ($builder) {
-			return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR);
-		}, $values);
-
-		$query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
-			->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->in('a.value', $params));
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Get user defined mounts by applicable
-	 *
-	 * @param int $type any of the self::APPLICABLE_TYPE_ constants
-	 * @param string|null $value user_id, group_id or null for global mounts
-	 * @return array
-	 */
-	public function getUserMountsFor($type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $this->getForQuery($builder, $type, $value);
-		$query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_PERSONAL, IQueryBuilder::PARAM_INT)));
-
-		return $this->getMountsFromQuery($query);
-	}
-
-	/**
-	 * Add a mount to the database
-	 *
-	 * @param string $mountPoint
-	 * @param string $storageBackend
-	 * @param string $authBackend
-	 * @param int $priority
-	 * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAL
-	 * @return int the id of the new mount
-	 */
-	public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) {
-		if (!$priority) {
-			$priority = 100;
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->insert('external_mounts')
-			->values([
-				'mount_point' => $builder->createNamedParameter($mountPoint, IQueryBuilder::PARAM_STR),
-				'storage_backend' => $builder->createNamedParameter($storageBackend, IQueryBuilder::PARAM_STR),
-				'auth_backend' => $builder->createNamedParameter($authBackend, IQueryBuilder::PARAM_STR),
-				'priority' => $builder->createNamedParameter($priority, IQueryBuilder::PARAM_INT),
-				'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * Remove a mount from the database
-	 *
-	 * @param int $mountId
-	 */
-	public function removeMount($mountId) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_mounts')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_applicable')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_config')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_options')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $newMountPoint
-	 */
-	public function setMountPoint($mountId, $newMountPoint) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('external_mounts')
-			->set('mount_point', $builder->createNamedParameter($newMountPoint))
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $newAuthBackend
-	 */
-	public function setAuthBackend($mountId, $newAuthBackend) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('external_mounts')
-			->set('auth_backend', $builder->createNamedParameter($newAuthBackend))
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $key
-	 * @param string $value
-	 */
-	public function setConfig($mountId, $key, $value) {
-		if ($key === 'password') {
-			$value = $this->encryptValue($value);
-		}
-
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_config')
-				->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
-				->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
-				->setValue('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
-				->executeStatement();
-		} catch (Exception $e) {
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->update('external_config')
-				->set('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
-				->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-				->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-			$query->executeStatement();
-		}
-	}
-
-	/**
-	 * @param int $mountId
-	 * @param string $key
-	 * @param string $value
-	 */
-	public function setOption($mountId, $key, $value) {
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_options')
-				->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
-				->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
-				->setValue('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
-				->executeStatement();
-		} catch (Exception $e) {
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->update('external_options')
-				->set('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
-				->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-				->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-			$query->executeStatement();
-		}
-	}
-
-	public function addApplicable($mountId, $type, $value) {
-		try {
-			$builder = $this->connection->getQueryBuilder();
-			$builder->insert('external_applicable')
-				->setValue('mount_id', $builder->createNamedParameter($mountId))
-				->setValue('type', $builder->createNamedParameter($type))
-				->setValue('value', $builder->createNamedParameter($value))
-				->executeStatement();
-		} catch (Exception $e) {
-			// applicable exists already
-			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				throw $e;
-			}
-		}
-	}
-
-	public function removeApplicable($mountId, $type, $value) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->delete('external_applicable')
-			->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->eq('type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
-
-		if (is_null($value)) {
-			$query = $query->andWhere($builder->expr()->isNull('value'));
-		} else {
-			$query = $query->andWhere($builder->expr()->eq('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR)));
-		}
-
-		$query->executeStatement();
-	}
-
-	private function getMountsFromQuery(IQueryBuilder $query) {
-		$result = $query->executeQuery();
-		$mounts = $result->fetchAll();
-		$uniqueMounts = [];
-		foreach ($mounts as $mount) {
-			$id = $mount['mount_id'];
-			if (!isset($uniqueMounts[$id])) {
-				$uniqueMounts[$id] = $mount;
-			}
-		}
-		$uniqueMounts = array_values($uniqueMounts);
-
-		$mountIds = array_map(function ($mount) {
-			return $mount['mount_id'];
-		}, $uniqueMounts);
-		$mountIds = array_values(array_unique($mountIds));
-
-		$applicable = $this->getApplicableForMounts($mountIds);
-		$config = $this->getConfigForMounts($mountIds);
-		$options = $this->getOptionsForMounts($mountIds);
-
-		return array_map(function ($mount, $applicable, $config, $options) {
-			$mount['type'] = (int)$mount['type'];
-			$mount['priority'] = (int)$mount['priority'];
-			$mount['applicable'] = $applicable;
-			$mount['config'] = $config;
-			$mount['options'] = $options;
-			return $mount;
-		}, $uniqueMounts, $applicable, $config, $options);
-	}
-
-	/**
-	 * Get mount options from a table grouped by mount id
-	 *
-	 * @param string $table
-	 * @param string[] $fields
-	 * @param int[] $mountIds
-	 * @return array [$mountId => [['field1' => $value1, ...], ...], ...]
-	 */
-	private function selectForMounts($table, array $fields, array $mountIds) {
-		if (count($mountIds) === 0) {
-			return [];
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$fields[] = 'mount_id';
-		$placeHolders = array_map(function ($id) use ($builder) {
-			return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT);
-		}, $mountIds);
-		$query = $builder->select($fields)
-			->from($table)
-			->where($builder->expr()->in('mount_id', $placeHolders));
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		$result = [];
-		foreach ($mountIds as $mountId) {
-			$result[$mountId] = [];
-		}
-		foreach ($rows as $row) {
-			if (isset($row['type'])) {
-				$row['type'] = (int)$row['type'];
-			}
-			$result[$row['mount_id']][] = $row;
-		}
-		return $result;
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => [['type' => $type, 'value' => $value], ...], ...]
-	 */
-	public function getApplicableForMounts($mountIds) {
-		return $this->selectForMounts('external_applicable', ['type', 'value'], $mountIds);
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => ['key1' => $value1, ...], ...]
-	 */
-	public function getConfigForMounts($mountIds) {
-		$mountConfigs = $this->selectForMounts('external_config', ['key', 'value'], $mountIds);
-		return array_map([$this, 'createKeyValueMap'], $mountConfigs);
-	}
-
-	/**
-	 * @param int[] $mountIds
-	 * @return array [$id => ['key1' => $value1, ...], ...]
-	 */
-	public function getOptionsForMounts($mountIds) {
-		$mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds);
-		$optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions);
-		return array_map(function (array $options) {
-			return array_map(function ($option) {
-				return json_decode($option);
-			}, $options);
-		}, $optionsMap);
-	}
-
-	/**
-	 * @param array $keyValuePairs [['key'=>$key, 'value=>$value], ...]
-	 * @return array ['key1' => $value1, ...]
-	 */
-	private function createKeyValueMap(array $keyValuePairs) {
-		$decryptedPairts = array_map(function ($pair) {
-			if ($pair['key'] === 'password') {
-				$pair['value'] = $this->decryptValue($pair['value']);
-			}
-			return $pair;
-		}, $keyValuePairs);
-		$keys = array_map(function ($pair) {
-			return $pair['key'];
-		}, $decryptedPairts);
-		$values = array_map(function ($pair) {
-			return $pair['value'];
-		}, $decryptedPairts);
-
-		return array_combine($keys, $values);
-	}
-
-	private function encryptValue($value) {
-		return $this->crypto->encrypt($value);
-	}
-
-	private function decryptValue($value) {
-		try {
-			return $this->crypto->decrypt($value);
-		} catch (\Exception $e) {
-			return $value;
-		}
-	}
-
-	/**
-	 * Check if any mountpoint is configured that overwrite the home folder
-	 */
-	public function hasHomeFolderOverwriteMount(): bool {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('mount_id')
-			->from('external_mounts')
-			->where($builder->expr()->eq('mount_point', $builder->createNamedParameter('/')))
-			->setMaxResults(1);
-		$result = $query->executeQuery();
-		return count($result->fetchAll()) > 0;
-	}
+    public const MOUNT_TYPE_ADMIN = 1;
+    public const MOUNT_TYPE_PERSONAL = 2;
+    /** @deprecated use MOUNT_TYPE_PERSONAL (full uppercase) instead */
+    public const MOUNT_TYPE_PERSONAl = 2;
+
+    public const APPLICABLE_TYPE_GLOBAL = 1;
+    public const APPLICABLE_TYPE_GROUP = 2;
+    public const APPLICABLE_TYPE_USER = 3;
+
+    public function __construct(
+        private IDBConnection $connection,
+        private ICrypto $crypto,
+    ) {
+    }
+
+    public function getMountById(int $mountId): ?array {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts', 'm')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $mounts = $this->getMountsFromQuery($query);
+        if (count($mounts) > 0) {
+            return $mounts[0];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get all configured mounts
+     *
+     * @return array
+     */
+    public function getAllMounts() {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts');
+        return $this->getMountsFromQuery($query);
+    }
+
+    public function getMountsForUser($userId, $groupIds) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->orX(
+                $builder->expr()->andX( // global mounts
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GLOBAL, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->isNull('a.value'),
+                ),
+                $builder->expr()->andX( // mounts for user
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_USER, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->eq('a.value', $builder->createNamedParameter($userId)),
+                ),
+                $builder->expr()->andX( // mounts for group
+                    $builder->expr()->eq('a.type', $builder->createNamedParameter(self::APPLICABLE_TYPE_GROUP, IQueryBuilder::PARAM_INT)),
+                    $builder->expr()->in('a.value', $builder->createNamedParameter($groupIds, IQueryBuilder::PARAM_STR_ARRAY)),
+                ),
+            ));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    public function modifyMountsOnUserDelete(string $uid): void {
+        $this->modifyMountsOnDelete($uid, self::APPLICABLE_TYPE_USER);
+    }
+
+    public function modifyMountsOnGroupDelete(string $gid): void {
+        $this->modifyMountsOnDelete($gid, self::APPLICABLE_TYPE_GROUP);
+    }
+
+    protected function modifyMountsOnDelete(string $applicableId, int $applicableType): void {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['a.mount_id', $builder->func()->count('a.mount_id', 'count')])
+            ->from('external_applicable', 'a')
+            ->leftJoin('a', 'external_applicable', 'b', $builder->expr()->eq('a.mount_id', 'b.mount_id'))
+            ->where($builder->expr()->andX(
+                $builder->expr()->eq('b.type', $builder->createNamedParameter($applicableType, IQueryBuilder::PARAM_INT)),
+                $builder->expr()->eq('b.value', $builder->createNamedParameter($applicableId)),
+            ),
+            )
+            ->groupBy(['a.mount_id']);
+        $stmt = $query->executeQuery();
+        $result = $stmt->fetchAll();
+        $stmt->closeCursor();
+
+        foreach ($result as $row) {
+            if ((int)$row['count'] > 1) {
+                $this->removeApplicable($row['mount_id'], $applicableType, $applicableId);
+            } else {
+                $this->removeMount($row['mount_id']);
+            }
+        }
+    }
+
+    /**
+     * Get admin defined mounts
+     *
+     * @return array
+     */
+    public function getAdminMounts() {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select(['mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'type'])
+            ->from('external_mounts')
+            ->where($builder->expr()->eq('type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+        return $this->getMountsFromQuery($query);
+    }
+
+    protected function getForQuery(IQueryBuilder $builder, $type, $value) {
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+
+        if (is_null($value)) {
+            $query = $query->andWhere($builder->expr()->isNull('a.value'));
+        } else {
+            $query = $query->andWhere($builder->expr()->eq('a.value', $builder->createNamedParameter($value)));
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get admin defined mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getAdminMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get admin defined mounts for multiple applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string[] $values user_ids or group_ids
+     * @return array
+     */
+    public function getAdminMountsForMultiple($type, array $values) {
+        $builder = $this->connection->getQueryBuilder();
+        $params = array_map(function ($value) use ($builder) {
+            return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR);
+        }, $values);
+
+        $query = $builder->select(['m.mount_id', 'mount_point', 'storage_backend', 'auth_backend', 'priority', 'm.type'])
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_applicable', 'a', $builder->expr()->eq('m.mount_id', 'a.mount_id'))
+            ->where($builder->expr()->eq('a.type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->in('a.value', $params));
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_ADMIN, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Get user defined mounts by applicable
+     *
+     * @param int $type any of the self::APPLICABLE_TYPE_ constants
+     * @param string|null $value user_id, group_id or null for global mounts
+     * @return array
+     */
+    public function getUserMountsFor($type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $this->getForQuery($builder, $type, $value);
+        $query->andWhere($builder->expr()->eq('m.type', $builder->expr()->literal(self::MOUNT_TYPE_PERSONAL, IQueryBuilder::PARAM_INT)));
+
+        return $this->getMountsFromQuery($query);
+    }
+
+    /**
+     * Add a mount to the database
+     *
+     * @param string $mountPoint
+     * @param string $storageBackend
+     * @param string $authBackend
+     * @param int $priority
+     * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAL
+     * @return int the id of the new mount
+     */
+    public function addMount($mountPoint, $storageBackend, $authBackend, $priority, $type) {
+        if (!$priority) {
+            $priority = 100;
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->insert('external_mounts')
+            ->values([
+                'mount_point' => $builder->createNamedParameter($mountPoint, IQueryBuilder::PARAM_STR),
+                'storage_backend' => $builder->createNamedParameter($storageBackend, IQueryBuilder::PARAM_STR),
+                'auth_backend' => $builder->createNamedParameter($authBackend, IQueryBuilder::PARAM_STR),
+                'priority' => $builder->createNamedParameter($priority, IQueryBuilder::PARAM_INT),
+                'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * Remove a mount from the database
+     *
+     * @param int $mountId
+     */
+    public function removeMount($mountId) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_mounts')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_applicable')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_config')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_options')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $newMountPoint
+     */
+    public function setMountPoint($mountId, $newMountPoint) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('external_mounts')
+            ->set('mount_point', $builder->createNamedParameter($newMountPoint))
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $newAuthBackend
+     */
+    public function setAuthBackend($mountId, $newAuthBackend) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('external_mounts')
+            ->set('auth_backend', $builder->createNamedParameter($newAuthBackend))
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
+
+        $query->executeStatement();
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $key
+     * @param string $value
+     */
+    public function setConfig($mountId, $key, $value) {
+        if ($key === 'password') {
+            $value = $this->encryptValue($value);
+        }
+
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_config')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
+                ->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
+                ->setValue('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
+                ->executeStatement();
+        } catch (Exception $e) {
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->update('external_config')
+                ->set('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
+                ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+                ->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
+            $query->executeStatement();
+        }
+    }
+
+    /**
+     * @param int $mountId
+     * @param string $key
+     * @param string $value
+     */
+    public function setOption($mountId, $key, $value) {
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_options')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT))
+                ->setValue('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR))
+                ->setValue('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
+                ->executeStatement();
+        } catch (Exception $e) {
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->update('external_options')
+                ->set('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
+                ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+                ->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
+            $query->executeStatement();
+        }
+    }
+
+    public function addApplicable($mountId, $type, $value) {
+        try {
+            $builder = $this->connection->getQueryBuilder();
+            $builder->insert('external_applicable')
+                ->setValue('mount_id', $builder->createNamedParameter($mountId))
+                ->setValue('type', $builder->createNamedParameter($type))
+                ->setValue('value', $builder->createNamedParameter($value))
+                ->executeStatement();
+        } catch (Exception $e) {
+            // applicable exists already
+            if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                throw $e;
+            }
+        }
+    }
+
+    public function removeApplicable($mountId, $type, $value) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->delete('external_applicable')
+            ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->eq('type', $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)));
+
+        if (is_null($value)) {
+            $query = $query->andWhere($builder->expr()->isNull('value'));
+        } else {
+            $query = $query->andWhere($builder->expr()->eq('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR)));
+        }
+
+        $query->executeStatement();
+    }
+
+    private function getMountsFromQuery(IQueryBuilder $query) {
+        $result = $query->executeQuery();
+        $mounts = $result->fetchAll();
+        $uniqueMounts = [];
+        foreach ($mounts as $mount) {
+            $id = $mount['mount_id'];
+            if (!isset($uniqueMounts[$id])) {
+                $uniqueMounts[$id] = $mount;
+            }
+        }
+        $uniqueMounts = array_values($uniqueMounts);
+
+        $mountIds = array_map(function ($mount) {
+            return $mount['mount_id'];
+        }, $uniqueMounts);
+        $mountIds = array_values(array_unique($mountIds));
+
+        $applicable = $this->getApplicableForMounts($mountIds);
+        $config = $this->getConfigForMounts($mountIds);
+        $options = $this->getOptionsForMounts($mountIds);
+
+        return array_map(function ($mount, $applicable, $config, $options) {
+            $mount['type'] = (int)$mount['type'];
+            $mount['priority'] = (int)$mount['priority'];
+            $mount['applicable'] = $applicable;
+            $mount['config'] = $config;
+            $mount['options'] = $options;
+            return $mount;
+        }, $uniqueMounts, $applicable, $config, $options);
+    }
+
+    /**
+     * Get mount options from a table grouped by mount id
+     *
+     * @param string $table
+     * @param string[] $fields
+     * @param int[] $mountIds
+     * @return array [$mountId => [['field1' => $value1, ...], ...], ...]
+     */
+    private function selectForMounts($table, array $fields, array $mountIds) {
+        if (count($mountIds) === 0) {
+            return [];
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $fields[] = 'mount_id';
+        $placeHolders = array_map(function ($id) use ($builder) {
+            return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT);
+        }, $mountIds);
+        $query = $builder->select($fields)
+            ->from($table)
+            ->where($builder->expr()->in('mount_id', $placeHolders));
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        $result = [];
+        foreach ($mountIds as $mountId) {
+            $result[$mountId] = [];
+        }
+        foreach ($rows as $row) {
+            if (isset($row['type'])) {
+                $row['type'] = (int)$row['type'];
+            }
+            $result[$row['mount_id']][] = $row;
+        }
+        return $result;
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => [['type' => $type, 'value' => $value], ...], ...]
+     */
+    public function getApplicableForMounts($mountIds) {
+        return $this->selectForMounts('external_applicable', ['type', 'value'], $mountIds);
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => ['key1' => $value1, ...], ...]
+     */
+    public function getConfigForMounts($mountIds) {
+        $mountConfigs = $this->selectForMounts('external_config', ['key', 'value'], $mountIds);
+        return array_map([$this, 'createKeyValueMap'], $mountConfigs);
+    }
+
+    /**
+     * @param int[] $mountIds
+     * @return array [$id => ['key1' => $value1, ...], ...]
+     */
+    public function getOptionsForMounts($mountIds) {
+        $mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds);
+        $optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions);
+        return array_map(function (array $options) {
+            return array_map(function ($option) {
+                return json_decode($option);
+            }, $options);
+        }, $optionsMap);
+    }
+
+    /**
+     * @param array $keyValuePairs [['key'=>$key, 'value=>$value], ...]
+     * @return array ['key1' => $value1, ...]
+     */
+    private function createKeyValueMap(array $keyValuePairs) {
+        $decryptedPairts = array_map(function ($pair) {
+            if ($pair['key'] === 'password') {
+                $pair['value'] = $this->decryptValue($pair['value']);
+            }
+            return $pair;
+        }, $keyValuePairs);
+        $keys = array_map(function ($pair) {
+            return $pair['key'];
+        }, $decryptedPairts);
+        $values = array_map(function ($pair) {
+            return $pair['value'];
+        }, $decryptedPairts);
+
+        return array_combine($keys, $values);
+    }
+
+    private function encryptValue($value) {
+        return $this->crypto->encrypt($value);
+    }
+
+    private function decryptValue($value) {
+        try {
+            return $this->crypto->decrypt($value);
+        } catch (\Exception $e) {
+            return $value;
+        }
+    }
+
+    /**
+     * Check if any mountpoint is configured that overwrite the home folder
+     */
+    public function hasHomeFolderOverwriteMount(): bool {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('mount_id')
+            ->from('external_mounts')
+            ->where($builder->expr()->eq('mount_point', $builder->createNamedParameter('/')))
+            ->setMaxResults(1);
+        $result = $query->executeQuery();
+        return count($result->fetchAll()) > 0;
+    }
 }

apps/workflowengine/lib/Settings/Personal.php

Indentation +6 added lines, -6 removed lines

@@ -28,11 +28,11 @@
 use OCP\WorkflowEngine\IManager;
 
 class Personal extends ASettings {
-	public function getScope(): int {
-		return IManager::SCOPE_USER;
-	}
+    public function getScope(): int {
+        return IManager::SCOPE_USER;
+    }
 
-	public function getSection(): ?string {
-		return $this->manager->isUserScopeEnabled() ? 'workflow' : null;
-	}
+    public function getSection(): ?string {
+        return $this->manager->isUserScopeEnabled() ? 'workflow' : null;
+    }
 }

lib/public/DB/QueryBuilder/ICompositeExpression.php

Indentation +32 added lines, -32 removed lines

@@ -29,39 +29,39 @@
  * @since 8.2.0
  */
 interface ICompositeExpression {
-	/**
-	 * Adds multiple parts to composite expression.
-	 *
-	 * @param array $parts
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function addMultiple(array $parts = []): ICompositeExpression;
+    /**
+     * Adds multiple parts to composite expression.
+     *
+     * @param array $parts
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function addMultiple(array $parts = []): ICompositeExpression;
 
-	/**
-	 * Adds an expression to composite expression.
-	 *
-	 * @param mixed $part
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function add($part): ICompositeExpression;
+    /**
+     * Adds an expression to composite expression.
+     *
+     * @param mixed $part
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function add($part): ICompositeExpression;
 
-	/**
-	 * Retrieves the amount of expressions on composite expression.
-	 *
-	 * @return integer
-	 * @since 8.2.0
-	 */
-	public function count(): int;
+    /**
+     * Retrieves the amount of expressions on composite expression.
+     *
+     * @return integer
+     * @since 8.2.0
+     */
+    public function count(): int;
 
-	/**
-	 * Returns the type of this composite expression (AND/OR).
-	 *
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getType(): string;
+    /**
+     * Returns the type of this composite expression (AND/OR).
+     *
+     * @return string
+     * @since 8.2.0
+     */
+    public function getType(): string;
 }

core/Command/Group/Info.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		$gid = $input->getArgument('groupid');
 		$group = $this->groupManager->get($gid);
 		if (!$group instanceof IGroup) {
-			$output->writeln('<error>Group "' . $gid . '" does not exist.</error>');
+			$output->writeln('<error>Group "'.$gid.'" does not exist.</error>');
 			return 1;
 		} else {
 			$groupOutput = [

Indentation +48 added lines, -48 removed lines

@@ -35,56 +35,56 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Info extends Base {
-	public function __construct(
-		protected IGroupManager $groupManager,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IGroupManager $groupManager,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:info')
-			->setDescription('Show information about a group')
-			->addArgument(
-				'groupid',
-				InputArgument::REQUIRED,
-				'Group id'
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:info')
+            ->setDescription('Show information about a group')
+            ->addArgument(
+                'groupid',
+                InputArgument::REQUIRED,
+                'Group id'
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$gid = $input->getArgument('groupid');
-		$group = $this->groupManager->get($gid);
-		if (!$group instanceof IGroup) {
-			$output->writeln('<error>Group "' . $gid . '" does not exist.</error>');
-			return 1;
-		} else {
-			$groupOutput = [
-				'groupID' => $gid,
-				'displayName' => $group->getDisplayName(),
-				'backends' => $group->getBackendNames(),
-			];
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $gid = $input->getArgument('groupid');
+        $group = $this->groupManager->get($gid);
+        if (!$group instanceof IGroup) {
+            $output->writeln('<error>Group "' . $gid . '" does not exist.</error>');
+            return 1;
+        } else {
+            $groupOutput = [
+                'groupID' => $gid,
+                'displayName' => $group->getDisplayName(),
+                'backends' => $group->getBackendNames(),
+            ];
 
-			$this->writeArrayInOutputFormat($input, $output, $groupOutput);
-			return 0;
-		}
-	}
+            $this->writeArrayInOutputFormat($input, $output, $groupOutput);
+            return 0;
+        }
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'groupid') {
-			return array_map(static fn (IGroup $group) => $group->getGID(), $this->groupManager->search($context->getCurrentWord()));
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'groupid') {
+            return array_map(static fn (IGroup $group) => $group->getGID(), $this->groupManager->search($context->getCurrentWord()));
+        }
+        return [];
+    }
 }

lib/private/Contacts/ContactsMenu/Entry.php

Spacing +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
 	 * sort the actions by priority and name
 	 */
 	private function sortActions(): void {
-		usort($this->actions, function (IAction $action1, IAction $action2) {
+		usort($this->actions, function(IAction $action1, IAction $action2) {
 			$prio1 = $action1->getPriority();
 			$prio2 = $action2->getPriority();
 
@@ -154,7 +154,7 @@ 
 	 */
 	public function jsonSerialize(): array {
 		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function (IAction $action) {
+		$otherActions = array_map(function(IAction $action) {
 			return $action->jsonSerialize();
 		}, array_slice($this->actions, 1));
 

Indentation +166 added lines, -166 removed lines

@@ -14,170 +14,170 @@
 use function array_merge;
 
 class Entry implements IEntry {
-	public const PROPERTY_STATUS_MESSAGE_TIMESTAMP = 'statusMessageTimestamp';
-
-	/** @var string|int|null */
-	private $id = null;
-
-	private string $fullName = '';
-
-	/** @var string[] */
-	private array $emailAddresses = [];
-
-	private ?string $avatar = null;
-
-	private ?string $profileTitle = null;
-
-	private ?string $profileUrl = null;
-
-	/** @var IAction[] */
-	private array $actions = [];
-
-	private array $properties = [];
-
-	private ?string $status = null;
-	private ?string $statusMessage = null;
-	private ?int $statusMessageTimestamp = null;
-	private ?string $statusIcon = null;
-
-	public function setId(string $id): void {
-		$this->id = $id;
-	}
-
-	public function setFullName(string $displayName): void {
-		$this->fullName = $displayName;
-	}
-
-	public function getFullName(): string {
-		return $this->fullName;
-	}
-
-	public function addEMailAddress(string $address): void {
-		$this->emailAddresses[] = $address;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getEMailAddresses(): array {
-		return $this->emailAddresses;
-	}
-
-	public function setAvatar(string $avatar): void {
-		$this->avatar = $avatar;
-	}
-
-	public function getAvatar(): ?string {
-		return $this->avatar;
-	}
-
-	public function setProfileTitle(string $profileTitle): void {
-		$this->profileTitle = $profileTitle;
-	}
-
-	public function getProfileTitle(): ?string {
-		return $this->profileTitle;
-	}
-
-	public function setProfileUrl(string $profileUrl): void {
-		$this->profileUrl = $profileUrl;
-	}
-
-	public function getProfileUrl(): ?string {
-		return $this->profileUrl;
-	}
-
-	public function addAction(IAction $action): void {
-		$this->actions[] = $action;
-		$this->sortActions();
-	}
-
-	public function setStatus(string $status,
-		?string $statusMessage = null,
-		?int $statusMessageTimestamp = null,
-		?string $icon = null): void {
-		$this->status = $status;
-		$this->statusMessage = $statusMessage;
-		$this->statusMessageTimestamp = $statusMessageTimestamp;
-		$this->statusIcon = $icon;
-	}
-
-	/**
-	 * @return IAction[]
-	 */
-	public function getActions(): array {
-		return $this->actions;
-	}
-
-	/**
-	 * sort the actions by priority and name
-	 */
-	private function sortActions(): void {
-		usort($this->actions, function (IAction $action1, IAction $action2) {
-			$prio1 = $action1->getPriority();
-			$prio2 = $action2->getPriority();
-
-			if ($prio1 === $prio2) {
-				// Ascending order for same priority
-				return strcasecmp($action1->getName(), $action2->getName());
-			}
-
-			// Descending order when priority differs
-			return $prio2 - $prio1;
-		});
-	}
-
-	public function setProperty(string $propertyName, mixed $value) {
-		$this->properties[$propertyName] = $value;
-	}
-
-	/**
-	 * @param array $properties key-value array containing additional properties
-	 */
-	public function setProperties(array $properties): void {
-		$this->properties = array_merge($this->properties, $properties);
-	}
-
-	public function getProperty(string $key): mixed {
-		if (!isset($this->properties[$key])) {
-			return null;
-		}
-		return $this->properties[$key];
-	}
-
-	/**
-	 * @return array{id: int|string|null, fullName: string, avatar: string|null, topAction: mixed, actions: array, lastMessage: '', emailAddresses: string[], profileTitle: string|null, profileUrl: string|null, status: string|null, statusMessage: null|string, statusMessageTimestamp: null|int, statusIcon: null|string, isUser: bool, uid: mixed}
-	 */
-	public function jsonSerialize(): array {
-		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function (IAction $action) {
-			return $action->jsonSerialize();
-		}, array_slice($this->actions, 1));
-
-		return [
-			'id' => $this->id,
-			'fullName' => $this->fullName,
-			'avatar' => $this->getAvatar(),
-			'topAction' => $topAction,
-			'actions' => $otherActions,
-			'lastMessage' => '',
-			'emailAddresses' => $this->getEMailAddresses(),
-			'profileTitle' => $this->profileTitle,
-			'profileUrl' => $this->profileUrl,
-			'status' => $this->status,
-			'statusMessage' => $this->statusMessage,
-			'statusMessageTimestamp' => $this->statusMessageTimestamp,
-			'statusIcon' => $this->statusIcon,
-			'isUser' => $this->getProperty('isUser') === true,
-			'uid' => $this->getProperty('UID'),
-		];
-	}
-
-	public function getStatusMessage(): ?string {
-		return $this->statusMessage;
-	}
-
-	public function getStatusMessageTimestamp(): ?int {
-		return $this->statusMessageTimestamp;
-	}
+    public const PROPERTY_STATUS_MESSAGE_TIMESTAMP = 'statusMessageTimestamp';
+
+    /** @var string|int|null */
+    private $id = null;
+
+    private string $fullName = '';
+
+    /** @var string[] */
+    private array $emailAddresses = [];
+
+    private ?string $avatar = null;
+
+    private ?string $profileTitle = null;
+
+    private ?string $profileUrl = null;
+
+    /** @var IAction[] */
+    private array $actions = [];
+
+    private array $properties = [];
+
+    private ?string $status = null;
+    private ?string $statusMessage = null;
+    private ?int $statusMessageTimestamp = null;
+    private ?string $statusIcon = null;
+
+    public function setId(string $id): void {
+        $this->id = $id;
+    }
+
+    public function setFullName(string $displayName): void {
+        $this->fullName = $displayName;
+    }
+
+    public function getFullName(): string {
+        return $this->fullName;
+    }
+
+    public function addEMailAddress(string $address): void {
+        $this->emailAddresses[] = $address;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getEMailAddresses(): array {
+        return $this->emailAddresses;
+    }
+
+    public function setAvatar(string $avatar): void {
+        $this->avatar = $avatar;
+    }
+
+    public function getAvatar(): ?string {
+        return $this->avatar;
+    }
+
+    public function setProfileTitle(string $profileTitle): void {
+        $this->profileTitle = $profileTitle;
+    }
+
+    public function getProfileTitle(): ?string {
+        return $this->profileTitle;
+    }
+
+    public function setProfileUrl(string $profileUrl): void {
+        $this->profileUrl = $profileUrl;
+    }
+
+    public function getProfileUrl(): ?string {
+        return $this->profileUrl;
+    }
+
+    public function addAction(IAction $action): void {
+        $this->actions[] = $action;
+        $this->sortActions();
+    }
+
+    public function setStatus(string $status,
+        ?string $statusMessage = null,
+        ?int $statusMessageTimestamp = null,
+        ?string $icon = null): void {
+        $this->status = $status;
+        $this->statusMessage = $statusMessage;
+        $this->statusMessageTimestamp = $statusMessageTimestamp;
+        $this->statusIcon = $icon;
+    }
+
+    /**
+     * @return IAction[]
+     */
+    public function getActions(): array {
+        return $this->actions;
+    }
+
+    /**
+     * sort the actions by priority and name
+     */
+    private function sortActions(): void {
+        usort($this->actions, function (IAction $action1, IAction $action2) {
+            $prio1 = $action1->getPriority();
+            $prio2 = $action2->getPriority();
+
+            if ($prio1 === $prio2) {
+                // Ascending order for same priority
+                return strcasecmp($action1->getName(), $action2->getName());
+            }
+
+            // Descending order when priority differs
+            return $prio2 - $prio1;
+        });
+    }
+
+    public function setProperty(string $propertyName, mixed $value) {
+        $this->properties[$propertyName] = $value;
+    }
+
+    /**
+     * @param array $properties key-value array containing additional properties
+     */
+    public function setProperties(array $properties): void {
+        $this->properties = array_merge($this->properties, $properties);
+    }
+
+    public function getProperty(string $key): mixed {
+        if (!isset($this->properties[$key])) {
+            return null;
+        }
+        return $this->properties[$key];
+    }
+
+    /**
+     * @return array{id: int|string|null, fullName: string, avatar: string|null, topAction: mixed, actions: array, lastMessage: '', emailAddresses: string[], profileTitle: string|null, profileUrl: string|null, status: string|null, statusMessage: null|string, statusMessageTimestamp: null|int, statusIcon: null|string, isUser: bool, uid: mixed}
+     */
+    public function jsonSerialize(): array {
+        $topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
+        $otherActions = array_map(function (IAction $action) {
+            return $action->jsonSerialize();
+        }, array_slice($this->actions, 1));
+
+        return [
+            'id' => $this->id,
+            'fullName' => $this->fullName,
+            'avatar' => $this->getAvatar(),
+            'topAction' => $topAction,
+            'actions' => $otherActions,
+            'lastMessage' => '',
+            'emailAddresses' => $this->getEMailAddresses(),
+            'profileTitle' => $this->profileTitle,
+            'profileUrl' => $this->profileUrl,
+            'status' => $this->status,
+            'statusMessage' => $this->statusMessage,
+            'statusMessageTimestamp' => $this->statusMessageTimestamp,
+            'statusIcon' => $this->statusIcon,
+            'isUser' => $this->getProperty('isUser') === true,
+            'uid' => $this->getProperty('UID'),
+        ];
+    }
+
+    public function getStatusMessage(): ?string {
+        return $this->statusMessage;
+    }
+
+    public function getStatusMessageTimestamp(): ?int {
+        return $this->statusMessageTimestamp;
+    }
 }

apps/admin_audit/lib/Actions/Trashbin.php

Indentation +10 added lines, -10 removed lines

@@ -29,15 +29,15 @@
 namespace OCA\AdminAudit\Actions;
 
 class Trashbin extends Action {
-	public function delete(array $params): void {
-		$this->log('File "%s" deleted from trash bin.',
-			['path' => $params['path']], ['path']
-		);
-	}
+    public function delete(array $params): void {
+        $this->log('File "%s" deleted from trash bin.',
+            ['path' => $params['path']], ['path']
+        );
+    }
 
-	public function restore(array $params): void {
-		$this->log('File "%s" restored from trash bin.',
-			['path' => $params['filePath']], ['path']
-		);
-	}
+    public function restore(array $params): void {
+        $this->log('File "%s" restored from trash bin.',
+            ['path' => $params['filePath']], ['path']
+        );
+    }
 }

lib/public/Share/Exceptions/AlreadySharedException.php

Indentation +15 added lines, -15 removed lines

@@ -29,22 +29,22 @@
  * @since 22.0.0
  */
 class AlreadySharedException extends GenericShareException {
-	/** @var IShare */
-	private $existingShare;
+    /** @var IShare */
+    private $existingShare;
 
-	/**
-	 * @since 22.0.0
-	 */
-	public function __construct(string $message, IShare $existingShare) {
-		parent::__construct($message);
+    /**
+     * @since 22.0.0
+     */
+    public function __construct(string $message, IShare $existingShare) {
+        parent::__construct($message);
 
-		$this->existingShare = $existingShare;
-	}
+        $this->existingShare = $existingShare;
+    }
 
-	/**
-	 * @since 22.0.0
-	 */
-	public function getExistingShare(): IShare {
-		return $this->existingShare;
-	}
+    /**
+     * @since 22.0.0
+     */
+    public function getExistingShare(): IShare {
+        return $this->existingShare;
+    }
 }

apps/provisioning_api/lib/AppInfo/Application.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+		$context->registerService(NewUserMailHelper::class, function(ContainerInterface $c) {
 			return new NewUserMailHelper(
 				$c->get(Defaults::class),
 				$c->get(IURLGenerator::class),
@@ -73,7 +73,7 @@ 
 				Util::getDefaultEmailAddress('no-reply')
 			);
 		});
-		$context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
+		$context->registerService(ProvisioningApiMiddleware::class, function(ContainerInterface $c) {
 			$user = $c->get(IUserManager::class)->get($c->get('UserId'));
 			$isAdmin = false;
 			$isSubAdmin = false;

Indentation +39 added lines, -39 removed lines

@@ -54,48 +54,48 @@
 use Psr\Container\ContainerInterface;
 
 class Application extends App implements IBootstrap {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('provisioning_api', $urlParams);
-	}
+    public function __construct(array $urlParams = []) {
+        parent::__construct('provisioning_api', $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
-			return new NewUserMailHelper(
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IFactory::class),
-				$c->get(IMailer::class),
-				$c->get(ISecureRandom::class),
-				$c->get(ITimeFactory::class),
-				$c->get(IConfig::class),
-				$c->get(ICrypto::class),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
-			$user = $c->get(IUserManager::class)->get($c->get('UserId'));
-			$isAdmin = false;
-			$isSubAdmin = false;
+        $context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+            return new NewUserMailHelper(
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IFactory::class),
+                $c->get(IMailer::class),
+                $c->get(ISecureRandom::class),
+                $c->get(ITimeFactory::class),
+                $c->get(IConfig::class),
+                $c->get(ICrypto::class),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
+            $user = $c->get(IUserManager::class)->get($c->get('UserId'));
+            $isAdmin = false;
+            $isSubAdmin = false;
 
-			if ($user instanceof IUser) {
-				$groupManager = $c->get(IGroupManager::class);
-				assert($groupManager instanceof GroupManager);
-				$isAdmin = $groupManager->isAdmin($user->getUID());
-				$isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
-			}
+            if ($user instanceof IUser) {
+                $groupManager = $c->get(IGroupManager::class);
+                assert($groupManager instanceof GroupManager);
+                $isAdmin = $groupManager->isAdmin($user->getUID());
+                $isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
+            }
 
-			return new ProvisioningApiMiddleware(
-				$c->get(IControllerMethodReflector::class),
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$context->registerMiddleware(ProvisioningApiMiddleware::class);
-		$context->registerCapability(Capabilities::class);
-	}
+            return new ProvisioningApiMiddleware(
+                $c->get(IControllerMethodReflector::class),
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $context->registerMiddleware(ProvisioningApiMiddleware::class);
+        $context->registerCapability(Capabilities::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }