nextcloud / server

lib/private/User/Listeners/BeforeUserDeletedListener.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 			// no avatar to remove
 		} catch (\Exception $e) {
 			// Ignore exceptions
-			$this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
+			$this->logger->info('Could not cleanup avatar of '.$user->getUID(), [
 				'exception' => $e,
 			]);
 		}

Indentation +32 added lines, -32 removed lines

@@ -20,36 +20,36 @@
  * @template-implements IEventListener<BeforeUserDeletedEvent>
  */
 class BeforeUserDeletedListener implements IEventListener {
-	private IAvatarManager $avatarManager;
-	private ICredentialsManager $credentialsManager;
-	private LoggerInterface $logger;
-
-	public function __construct(LoggerInterface $logger, IAvatarManager $avatarManager, ICredentialsManager $credentialsManager) {
-		$this->avatarManager = $avatarManager;
-		$this->credentialsManager = $credentialsManager;
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof BeforeUserDeletedEvent)) {
-			return;
-		}
-
-		$user = $event->getUser();
-
-		// Delete avatar on user deletion
-		try {
-			$avatar = $this->avatarManager->getAvatar($user->getUID());
-			$avatar->remove(true);
-		} catch (NotFoundException $e) {
-			// no avatar to remove
-		} catch (\Exception $e) {
-			// Ignore exceptions
-			$this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
-				'exception' => $e,
-			]);
-		}
-		// Delete storages credentials on user deletion
-		$this->credentialsManager->erase($user->getUID());
-	}
+    private IAvatarManager $avatarManager;
+    private ICredentialsManager $credentialsManager;
+    private LoggerInterface $logger;
+
+    public function __construct(LoggerInterface $logger, IAvatarManager $avatarManager, ICredentialsManager $credentialsManager) {
+        $this->avatarManager = $avatarManager;
+        $this->credentialsManager = $credentialsManager;
+        $this->logger = $logger;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof BeforeUserDeletedEvent)) {
+            return;
+        }
+
+        $user = $event->getUser();
+
+        // Delete avatar on user deletion
+        try {
+            $avatar = $this->avatarManager->getAvatar($user->getUID());
+            $avatar->remove(true);
+        } catch (NotFoundException $e) {
+            // no avatar to remove
+        } catch (\Exception $e) {
+            // Ignore exceptions
+            $this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
+                'exception' => $e,
+            ]);
+        }
+        // Delete storages credentials on user deletion
+        $this->credentialsManager->erase($user->getUID());
+    }
 }

lib/private/TagManager.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 			return;
 		}
 
-		$tagsIds = array_map(fn (array $row) => (int)$row['id'], $result->fetchAll());
+		$tagsIds = array_map(fn (array $row) => (int) $row['id'], $result->fetchAll());
 		$result->closeCursor();
 
 		if (count($tagsIds) === 0) {

Indentation +98 added lines, -98 removed lines

@@ -25,113 +25,113 @@
  */
 class TagManager implements ITagManager, IEventListener {
 
-	public function __construct(
-		private TagMapper $mapper,
-		private IUserSession $userSession,
-		private IDBConnection $connection,
-		private LoggerInterface $logger,
-		private IEventDispatcher $dispatcher,
-	) {
-	}
+    public function __construct(
+        private TagMapper $mapper,
+        private IUserSession $userSession,
+        private IDBConnection $connection,
+        private LoggerInterface $logger,
+        private IEventDispatcher $dispatcher,
+    ) {
+    }
 
-	/**
-	 * Create a new \OCP\ITags instance and load tags from db.
-	 *
-	 * @see \OCP\ITags
-	 * @param string $type The type identifier e.g. 'contact' or 'event'.
-	 * @param array $defaultTags An array of default tags to be used if none are stored.
-	 * @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	 * @param string $userId user for which to retrieve the tags, defaults to the currently
-	 *                       logged in user
-	 * @return \OCP\ITags
-	 *
-	 * since 20.0.0 $includeShared isn't used anymore
-	 */
-	public function load($type, $defaultTags = [], $includeShared = false, $userId = null) {
-		if (is_null($userId)) {
-			$user = $this->userSession->getUser();
-			if ($user === null) {
-				// nothing we can do without a user
-				return null;
-			}
-			$userId = $this->userSession->getUser()->getUId();
-		}
-		return new Tags($this->mapper, $userId, $type, $this->logger, $this->connection, $this->dispatcher, $this->userSession, $defaultTags);
-	}
+    /**
+     * Create a new \OCP\ITags instance and load tags from db.
+     *
+     * @see \OCP\ITags
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
+     * @param array $defaultTags An array of default tags to be used if none are stored.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
+     *                       logged in user
+     * @return \OCP\ITags
+     *
+     * since 20.0.0 $includeShared isn't used anymore
+     */
+    public function load($type, $defaultTags = [], $includeShared = false, $userId = null) {
+        if (is_null($userId)) {
+            $user = $this->userSession->getUser();
+            if ($user === null) {
+                // nothing we can do without a user
+                return null;
+            }
+            $userId = $this->userSession->getUser()->getUId();
+        }
+        return new Tags($this->mapper, $userId, $type, $this->logger, $this->connection, $this->dispatcher, $this->userSession, $defaultTags);
+    }
 
-	/**
-	 * Get all users who favorited an object
-	 *
-	 * @param string $objectType
-	 * @param int $objectId
-	 * @return array
-	 */
-	public function getUsersFavoritingObject(string $objectType, int $objectId): array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('uid')
-			->from('vcategory_to_object', 'o')
-			->innerJoin('o', 'vcategory', 'c', $query->expr()->eq('o.categoryid', 'c.id'))
-			->where($query->expr()->eq('objid', $query->createNamedParameter($objectId, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('c.type', $query->createNamedParameter($objectType)))
-			->andWhere($query->expr()->eq('c.category', $query->createNamedParameter(ITags::TAG_FAVORITE)));
+    /**
+     * Get all users who favorited an object
+     *
+     * @param string $objectType
+     * @param int $objectId
+     * @return array
+     */
+    public function getUsersFavoritingObject(string $objectType, int $objectId): array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('uid')
+            ->from('vcategory_to_object', 'o')
+            ->innerJoin('o', 'vcategory', 'c', $query->expr()->eq('o.categoryid', 'c.id'))
+            ->where($query->expr()->eq('objid', $query->createNamedParameter($objectId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('c.type', $query->createNamedParameter($objectType)))
+            ->andWhere($query->expr()->eq('c.category', $query->createNamedParameter(ITags::TAG_FAVORITE)));
 
-		$result = $query->execute();
-		$users = $result->fetchAll(\PDO::FETCH_COLUMN);
-		$result->closeCursor();
+        $result = $query->execute();
+        $users = $result->fetchAll(\PDO::FETCH_COLUMN);
+        $result->closeCursor();
 
-		return $users;
-	}
+        return $users;
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof UserDeletedEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof UserDeletedEvent)) {
+            return;
+        }
 
-		// Find all objectid/tagId pairs.
-		$user = $event->getUser();
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('id')
-			->from('vcategory')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())));
-		try {
-			$result = $qb->executeQuery();
-		} catch (DBException $e) {
-			$this->logger->error($e->getMessage(), [
-				'app' => 'core',
-				'exception' => $e,
-			]);
-			return;
-		}
+        // Find all objectid/tagId pairs.
+        $user = $event->getUser();
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('id')
+            ->from('vcategory')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())));
+        try {
+            $result = $qb->executeQuery();
+        } catch (DBException $e) {
+            $this->logger->error($e->getMessage(), [
+                'app' => 'core',
+                'exception' => $e,
+            ]);
+            return;
+        }
 
-		$tagsIds = array_map(fn (array $row) => (int)$row['id'], $result->fetchAll());
-		$result->closeCursor();
+        $tagsIds = array_map(fn (array $row) => (int)$row['id'], $result->fetchAll());
+        $result->closeCursor();
 
-		if (count($tagsIds) === 0) {
-			return;
-		}
+        if (count($tagsIds) === 0) {
+            return;
+        }
 
-		// Clean vcategory_to_object table
-		$qb = $this->connection->getQueryBuilder();
-		$qb = $qb->delete('vcategory_to_object')
-			->where($qb->expr()->in('categoryid', $qb->createParameter('chunk')));
+        // Clean vcategory_to_object table
+        $qb = $this->connection->getQueryBuilder();
+        $qb = $qb->delete('vcategory_to_object')
+            ->where($qb->expr()->in('categoryid', $qb->createParameter('chunk')));
 
-		// Clean vcategory
-		$qb1 = $this->connection->getQueryBuilder();
-		$qb1 = $qb1->delete('vcategory')
-			->where($qb1->expr()->in('uid', $qb1->createParameter('chunk')));
+        // Clean vcategory
+        $qb1 = $this->connection->getQueryBuilder();
+        $qb1 = $qb1->delete('vcategory')
+            ->where($qb1->expr()->in('uid', $qb1->createParameter('chunk')));
 
-		foreach (array_chunk($tagsIds, 1000) as $tagChunk) {
-			$qb->setParameter('chunk', $tagChunk, IQueryBuilder::PARAM_INT_ARRAY);
-			$qb1->setParameter('chunk', $tagChunk, IQueryBuilder::PARAM_INT_ARRAY);
-			try {
-				$qb->executeStatement();
-				$qb1->executeStatement();
-			} catch (DBException $e) {
-				$this->logger->error($e->getMessage(), [
-					'app' => 'core',
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+        foreach (array_chunk($tagsIds, 1000) as $tagChunk) {
+            $qb->setParameter('chunk', $tagChunk, IQueryBuilder::PARAM_INT_ARRAY);
+            $qb1->setParameter('chunk', $tagChunk, IQueryBuilder::PARAM_INT_ARRAY);
+            try {
+                $qb->executeStatement();
+                $qb1->executeStatement();
+            } catch (DBException $e) {
+                $this->logger->error($e->getMessage(), [
+                    'app' => 'core',
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

apps/files/lib/Controller/OpenLocalEditorController.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 			}
 		}
 
-		$this->logger->error('Giving up after ' . self::TOKEN_RETRIES . ' retries to generate a unique local editor token for path hash: ' . $pathHash);
+		$this->logger->error('Giving up after '.self::TOKEN_RETRIES.' retries to generate a unique local editor token for path hash: '.$pathHash);
 		return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
 	}
 

Indentation +99 added lines, -99 removed lines

@@ -25,104 +25,104 @@
 use Psr\Log\LoggerInterface;
 
 class OpenLocalEditorController extends OCSController {
-	public const TOKEN_LENGTH = 128;
-	public const TOKEN_DURATION = 600; // 10 Minutes
-	public const TOKEN_RETRIES = 50;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		protected ITimeFactory $timeFactory,
-		protected OpenLocalEditorMapper $mapper,
-		protected ISecureRandom $secureRandom,
-		protected LoggerInterface $logger,
-		protected ?string $userId,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * Create a local editor
-	 *
-	 * @param string $path Path of the file
-	 *
-	 * @return DataResponse<Http::STATUS_OK, array{userId: ?string, pathHash: string, expirationTime: int, token: string}, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, list<empty>, array{}>
-	 *
-	 * 200: Local editor returned
-	 */
-	#[NoAdminRequired]
-	#[UserRateLimit(limit: 10, period: 120)]
-	public function create(string $path): DataResponse {
-		$pathHash = sha1($path);
-
-		$entity = new OpenLocalEditor();
-		$entity->setUserId($this->userId);
-		$entity->setPathHash($pathHash);
-		$entity->setExpirationTime($this->timeFactory->getTime() + self::TOKEN_DURATION); // Expire in 10 minutes
-
-		for ($i = 1; $i <= self::TOKEN_RETRIES; $i++) {
-			$token = $this->secureRandom->generate(self::TOKEN_LENGTH, ISecureRandom::CHAR_ALPHANUMERIC);
-			$entity->setToken($token);
-
-			try {
-				$this->mapper->insert($entity);
-
-				return new DataResponse([
-					'userId' => $this->userId,
-					'pathHash' => $pathHash,
-					'expirationTime' => $entity->getExpirationTime(),
-					'token' => $entity->getToken(),
-				]);
-			} catch (Exception $e) {
-				if ($e->getCode() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					// Only retry on unique constraint violation
-					throw $e;
-				}
-			}
-		}
-
-		$this->logger->error('Giving up after ' . self::TOKEN_RETRIES . ' retries to generate a unique local editor token for path hash: ' . $pathHash);
-		return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-	}
-
-	/**
-	 * Validate a local editor
-	 *
-	 * @param string $path Path of the file
-	 * @param string $token Token of the local editor
-	 *
-	 * @return DataResponse<Http::STATUS_OK, array{userId: string, pathHash: string, expirationTime: int, token: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>
-	 *
-	 * 200: Local editor validated successfully
-	 * 404: Local editor not found
-	 */
-	#[NoAdminRequired]
-	#[BruteForceProtection(action: 'openLocalEditor')]
-	public function validate(string $path, string $token): DataResponse {
-		$pathHash = sha1($path);
-
-		try {
-			$entity = $this->mapper->verifyToken($this->userId, $pathHash, $token);
-		} catch (DoesNotExistException $e) {
-			$response = new DataResponse([], Http::STATUS_NOT_FOUND);
-			$response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
-			return $response;
-		}
-
-		$this->mapper->delete($entity);
-
-		if ($entity->getExpirationTime() <= $this->timeFactory->getTime()) {
-			$response = new DataResponse([], Http::STATUS_NOT_FOUND);
-			$response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
-			return $response;
-		}
-
-		return new DataResponse([
-			'userId' => $this->userId,
-			'pathHash' => $pathHash,
-			'expirationTime' => $entity->getExpirationTime(),
-			'token' => $entity->getToken(),
-		]);
-	}
+    public const TOKEN_LENGTH = 128;
+    public const TOKEN_DURATION = 600; // 10 Minutes
+    public const TOKEN_RETRIES = 50;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        protected ITimeFactory $timeFactory,
+        protected OpenLocalEditorMapper $mapper,
+        protected ISecureRandom $secureRandom,
+        protected LoggerInterface $logger,
+        protected ?string $userId,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * Create a local editor
+     *
+     * @param string $path Path of the file
+     *
+     * @return DataResponse<Http::STATUS_OK, array{userId: ?string, pathHash: string, expirationTime: int, token: string}, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, list<empty>, array{}>
+     *
+     * 200: Local editor returned
+     */
+    #[NoAdminRequired]
+    #[UserRateLimit(limit: 10, period: 120)]
+    public function create(string $path): DataResponse {
+        $pathHash = sha1($path);
+
+        $entity = new OpenLocalEditor();
+        $entity->setUserId($this->userId);
+        $entity->setPathHash($pathHash);
+        $entity->setExpirationTime($this->timeFactory->getTime() + self::TOKEN_DURATION); // Expire in 10 minutes
+
+        for ($i = 1; $i <= self::TOKEN_RETRIES; $i++) {
+            $token = $this->secureRandom->generate(self::TOKEN_LENGTH, ISecureRandom::CHAR_ALPHANUMERIC);
+            $entity->setToken($token);
+
+            try {
+                $this->mapper->insert($entity);
+
+                return new DataResponse([
+                    'userId' => $this->userId,
+                    'pathHash' => $pathHash,
+                    'expirationTime' => $entity->getExpirationTime(),
+                    'token' => $entity->getToken(),
+                ]);
+            } catch (Exception $e) {
+                if ($e->getCode() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                    // Only retry on unique constraint violation
+                    throw $e;
+                }
+            }
+        }
+
+        $this->logger->error('Giving up after ' . self::TOKEN_RETRIES . ' retries to generate a unique local editor token for path hash: ' . $pathHash);
+        return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+    }
+
+    /**
+     * Validate a local editor
+     *
+     * @param string $path Path of the file
+     * @param string $token Token of the local editor
+     *
+     * @return DataResponse<Http::STATUS_OK, array{userId: string, pathHash: string, expirationTime: int, token: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>
+     *
+     * 200: Local editor validated successfully
+     * 404: Local editor not found
+     */
+    #[NoAdminRequired]
+    #[BruteForceProtection(action: 'openLocalEditor')]
+    public function validate(string $path, string $token): DataResponse {
+        $pathHash = sha1($path);
+
+        try {
+            $entity = $this->mapper->verifyToken($this->userId, $pathHash, $token);
+        } catch (DoesNotExistException $e) {
+            $response = new DataResponse([], Http::STATUS_NOT_FOUND);
+            $response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
+            return $response;
+        }
+
+        $this->mapper->delete($entity);
+
+        if ($entity->getExpirationTime() <= $this->timeFactory->getTime()) {
+            $response = new DataResponse([], Http::STATUS_NOT_FOUND);
+            $response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
+            return $response;
+        }
+
+        return new DataResponse([
+            'userId' => $this->userId,
+            'pathHash' => $pathHash,
+            'expirationTime' => $entity->getExpirationTime(),
+            'token' => $entity->getToken(),
+        ]);
+    }
 
 }

apps/files/lib/Db/OpenLocalEditor.php

Indentation +14 added lines, -14 removed lines

@@ -39,22 +39,22 @@
  * @method string getToken()
  */
 class OpenLocalEditor extends Entity {
-	/** @var string */
-	protected $userId;
+    /** @var string */
+    protected $userId;
 
-	/** @var string */
-	protected $pathHash;
+    /** @var string */
+    protected $pathHash;
 
-	/** @var int */
-	protected $expirationTime;
+    /** @var int */
+    protected $expirationTime;
 
-	/** @var string */
-	protected $token;
+    /** @var string */
+    protected $token;
 
-	public function __construct() {
-		$this->addType('userId', 'string');
-		$this->addType('pathHash', 'string');
-		$this->addType('expirationTime', 'integer');
-		$this->addType('token', 'string');
-	}
+    public function __construct() {
+        $this->addType('userId', 'string');
+        $this->addType('pathHash', 'string');
+        $this->addType('expirationTime', 'integer');
+        $this->addType('token', 'string');
+    }
 }

apps/user_status/lib/Db/UserStatusMapper.php

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 					$qb->expr()->isNotNull('custom_icon'),
 					$qb->expr()->isNotNull('custom_message'),
 				),
-				$qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%'))
+				$qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_').'%'))
 			));
 
 		if ($limit !== null) {
@@ -106,7 +106,7 @@ 
 		$qb
 			->select('*')
 			->from($this->tableName)
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR)));
+			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_'.$userId : $userId, IQueryBuilder::PARAM_STR)));
 
 		return $this->findEntity($qb);
 	}
@@ -195,7 +195,7 @@ 
 		$qb = $this->db->getQueryBuilder();
 		$qb->update($this->tableName)
 			->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
-			->set('user_id', $qb->createNamedParameter('_' . $userId))
+			->set('user_id', $qb->createNamedParameter('_'.$userId))
 			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
 		return $qb->executeStatement() > 0;
 	}

Indentation +174 added lines, -174 removed lines

@@ -20,178 +20,178 @@
  */
 class UserStatusMapper extends QBMapper {
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'user_status');
-	}
-
-	/**
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return UserStatus[]
-	 */
-	public function findAll(?int $limit = null, ?int $offset = null):array {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName);
-
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array
-	 */
-	public function findAllRecent(?int $limit = null, ?int $offset = null): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->orderBy('status_message_timestamp', 'DESC')
-			->where($qb->expr()->andX(
-				$qb->expr()->neq('status_message_timestamp', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
-				$qb->expr()->orX(
-					$qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)),
-					$qb->expr()->isNotNull('message_id'),
-					$qb->expr()->isNotNull('custom_icon'),
-					$qb->expr()->isNotNull('custom_message'),
-				),
-				$qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%'))
-			));
-
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param string $userId
-	 * @return UserStatus
-	 * @throws DoesNotExistException
-	 */
-	public function findByUserId(string $userId, bool $isBackup = false): UserStatus {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR)));
-
-		return $this->findEntity($qb);
-	}
-
-	/**
-	 * @param array $userIds
-	 * @return array
-	 */
-	public function findByUserIds(array $userIds): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->in('user_id', $qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param int $olderThan
-	 * @param int $now
-	 */
-	public function clearStatusesOlderThan(int $olderThan, int $now): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName)
-			->set('status', $qb->createNamedParameter(IUserStatus::OFFLINE))
-			->set('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
-			->set('status_timestamp', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
-			->where($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->neq('status', $qb->createNamedParameter(IUserStatus::OFFLINE)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL),
-				$qb->expr()->eq('status', $qb->createNamedParameter(IUserStatus::ONLINE))
-			));
-
-		$qb->executeStatement();
-	}
-
-	/**
-	 * Clear all statuses older than a given timestamp
-	 *
-	 * @param int $timestamp
-	 */
-	public function clearOlderThanClearAt(int $timestamp): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->isNotNull('clear_at'))
-			->andWhere($qb->expr()->lte('clear_at', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT)));
-
-		$qb->executeStatement();
-	}
-
-
-	/**
-	 * Deletes a user status so we can restore the backup
-	 *
-	 * @param string $userId
-	 * @param string $messageId
-	 * @return bool True if an entry was deleted
-	 */
-	public function deleteCurrentStatusToRestoreBackup(string $userId, string $messageId): bool {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)))
-			->andWhere($qb->expr()->eq('message_id', $qb->createNamedParameter($messageId)))
-			->andWhere($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)));
-		return $qb->executeStatement() > 0;
-	}
-
-	public function deleteByIds(array $ids): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
-		$qb->executeStatement();
-	}
-
-	/**
-	 * @param string $userId
-	 * @return bool
-	 * @throws \OCP\DB\Exception
-	 */
-	public function createBackupStatus(string $userId): bool {
-		// Prefix user account with an underscore because user_id is marked as unique
-		// in the table. Starting a username with an underscore is not allowed so this
-		// shouldn't create any trouble.
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName)
-			->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
-			->set('user_id', $qb->createNamedParameter('_' . $userId))
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
-		return $qb->executeStatement() > 0;
-	}
-
-	public function restoreBackupStatuses(array $ids): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName)
-			->set('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
-			->set('user_id', $qb->func()->substring('user_id', $qb->createNamedParameter(2, IQueryBuilder::PARAM_INT)))
-			->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
-
-		$qb->executeStatement();
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'user_status');
+    }
+
+    /**
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return UserStatus[]
+     */
+    public function findAll(?int $limit = null, ?int $offset = null):array {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName);
+
+        if ($limit !== null) {
+            $qb->setMaxResults($limit);
+        }
+        if ($offset !== null) {
+            $qb->setFirstResult($offset);
+        }
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array
+     */
+    public function findAllRecent(?int $limit = null, ?int $offset = null): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->orderBy('status_message_timestamp', 'DESC')
+            ->where($qb->expr()->andX(
+                $qb->expr()->neq('status_message_timestamp', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
+                $qb->expr()->orX(
+                    $qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)),
+                    $qb->expr()->isNotNull('message_id'),
+                    $qb->expr()->isNotNull('custom_icon'),
+                    $qb->expr()->isNotNull('custom_message'),
+                ),
+                $qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%'))
+            ));
+
+        if ($limit !== null) {
+            $qb->setMaxResults($limit);
+        }
+        if ($offset !== null) {
+            $qb->setFirstResult($offset);
+        }
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param string $userId
+     * @return UserStatus
+     * @throws DoesNotExistException
+     */
+    public function findByUserId(string $userId, bool $isBackup = false): UserStatus {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR)));
+
+        return $this->findEntity($qb);
+    }
+
+    /**
+     * @param array $userIds
+     * @return array
+     */
+    public function findByUserIds(array $userIds): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->in('user_id', $qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param int $olderThan
+     * @param int $now
+     */
+    public function clearStatusesOlderThan(int $olderThan, int $now): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName)
+            ->set('status', $qb->createNamedParameter(IUserStatus::OFFLINE))
+            ->set('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
+            ->set('status_timestamp', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
+            ->where($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->neq('status', $qb->createNamedParameter(IUserStatus::OFFLINE)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL),
+                $qb->expr()->eq('status', $qb->createNamedParameter(IUserStatus::ONLINE))
+            ));
+
+        $qb->executeStatement();
+    }
+
+    /**
+     * Clear all statuses older than a given timestamp
+     *
+     * @param int $timestamp
+     */
+    public function clearOlderThanClearAt(int $timestamp): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->isNotNull('clear_at'))
+            ->andWhere($qb->expr()->lte('clear_at', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT)));
+
+        $qb->executeStatement();
+    }
+
+
+    /**
+     * Deletes a user status so we can restore the backup
+     *
+     * @param string $userId
+     * @param string $messageId
+     * @return bool True if an entry was deleted
+     */
+    public function deleteCurrentStatusToRestoreBackup(string $userId, string $messageId): bool {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)))
+            ->andWhere($qb->expr()->eq('message_id', $qb->createNamedParameter($messageId)))
+            ->andWhere($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)));
+        return $qb->executeStatement() > 0;
+    }
+
+    public function deleteByIds(array $ids): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
+        $qb->executeStatement();
+    }
+
+    /**
+     * @param string $userId
+     * @return bool
+     * @throws \OCP\DB\Exception
+     */
+    public function createBackupStatus(string $userId): bool {
+        // Prefix user account with an underscore because user_id is marked as unique
+        // in the table. Starting a username with an underscore is not allowed so this
+        // shouldn't create any trouble.
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName)
+            ->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
+            ->set('user_id', $qb->createNamedParameter('_' . $userId))
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
+        return $qb->executeStatement() > 0;
+    }
+
+    public function restoreBackupStatuses(array $ids): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName)
+            ->set('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
+            ->set('user_id', $qb->func()->substring('user_id', $qb->createNamedParameter(2, IQueryBuilder::PARAM_INT)))
+            ->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
+
+        $qb->executeStatement();
+    }
 }

lib/public/Files/SimpleFS/ISimpleFolder.php

Indentation +58 added lines, -58 removed lines

@@ -32,69 +32,69 @@
  * @since 11.0.0
  */
 interface ISimpleFolder {
-	/**
-	 * Get all the files in a folder
-	 *
-	 * @return ISimpleFile[]
-	 * @since 11.0.0
-	 */
-	public function getDirectoryListing(): array;
+    /**
+     * Get all the files in a folder
+     *
+     * @return ISimpleFile[]
+     * @since 11.0.0
+     */
+    public function getDirectoryListing(): array;
 
-	/**
-	 * Check if a file with $name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function fileExists(string $name): bool;
+    /**
+     * Check if a file with $name exists
+     *
+     * @param string $name
+     * @return bool
+     * @since 11.0.0
+     */
+    public function fileExists(string $name): bool;
 
-	/**
-	 * Get the file named $name from the folder
-	 *
-	 * @throws NotFoundException
-	 * @since 11.0.0
-	 */
-	public function getFile(string $name): ISimpleFile;
+    /**
+     * Get the file named $name from the folder
+     *
+     * @throws NotFoundException
+     * @since 11.0.0
+     */
+    public function getFile(string $name): ISimpleFile;
 
-	/**
-	 * Creates a new file with $name in the folder
-	 *
-	 * @param string|resource|null $content @since 19.0.0
-	 * @throws NotPermittedException
-	 * @since 11.0.0
-	 */
-	public function newFile(string $name, $content = null): ISimpleFile;
+    /**
+     * Creates a new file with $name in the folder
+     *
+     * @param string|resource|null $content @since 19.0.0
+     * @throws NotPermittedException
+     * @since 11.0.0
+     */
+    public function newFile(string $name, $content = null): ISimpleFile;
 
-	/**
-	 * Remove the folder and all the files in it
-	 *
-	 * @throws NotPermittedException
-	 * @since 11.0.0
-	 */
-	public function delete(): void;
+    /**
+     * Remove the folder and all the files in it
+     *
+     * @throws NotPermittedException
+     * @since 11.0.0
+     */
+    public function delete(): void;
 
-	/**
-	 * Get the folder name
-	 *
-	 * @since 11.0.0
-	 */
-	public function getName(): string;
+    /**
+     * Get the folder name
+     *
+     * @since 11.0.0
+     */
+    public function getName(): string;
 
-	/**
-	 * Get the folder named $name from the current folder
-	 *
-	 * @throws NotFoundException
-	 * @since 25.0.0
-	 */
-	public function getFolder(string $name): ISimpleFolder;
+    /**
+     * Get the folder named $name from the current folder
+     *
+     * @throws NotFoundException
+     * @since 25.0.0
+     */
+    public function getFolder(string $name): ISimpleFolder;
 
-	/**
-	 * Creates a new folder with $name in the current folder
-	 *
-	 * @param string|resource|null $content @since 19.0.0
-	 * @throws NotPermittedException
-	 * @since 25.0.0
-	 */
-	public function newFolder(string $path): ISimpleFolder;
+    /**
+     * Creates a new folder with $name in the current folder
+     *
+     * @param string|resource|null $content @since 19.0.0
+     * @throws NotPermittedException
+     * @since 25.0.0
+     */
+    public function newFolder(string $path): ISimpleFolder;
 }

apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -89,10 +89,10 @@
 	 * @return void
 	 */
 	public function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
+		$propFind->handle('{DAV:}supportedlock', function() {
 			return new SupportedLock();
 		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+		$propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
 			return new LockDiscovery([]);
 		});
 	}

Indentation +99 added lines, -99 removed lines

@@ -31,113 +31,113 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class FakeLockerPlugin extends ServerPlugin {
-	/** @var Server */
-	private $server;
+    /** @var Server */
+    private $server;
 
-	/** {@inheritDoc} */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
-		$this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
-		$server->on('propFind', [$this, 'propFind']);
-		$server->on('validateTokens', [$this, 'validateTokens']);
-	}
+    /** {@inheritDoc} */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
+        $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
+        $server->on('propFind', [$this, 'propFind']);
+        $server->on('validateTokens', [$this, 'validateTokens']);
+    }
 
-	/**
-	 * Indicate that we support LOCK and UNLOCK
-	 *
-	 * @param string $path
-	 * @return string[]
-	 */
-	public function getHTTPMethods($path) {
-		return [
-			'LOCK',
-			'UNLOCK',
-		];
-	}
+    /**
+     * Indicate that we support LOCK and UNLOCK
+     *
+     * @param string $path
+     * @return string[]
+     */
+    public function getHTTPMethods($path) {
+        return [
+            'LOCK',
+            'UNLOCK',
+        ];
+    }
 
-	/**
-	 * Indicate that we support locking
-	 *
-	 * @return integer[]
-	 */
-	public function getFeatures() {
-		return [2];
-	}
+    /**
+     * Indicate that we support locking
+     *
+     * @return integer[]
+     */
+    public function getFeatures() {
+        return [2];
+    }
 
-	/**
-	 * Return some dummy response for PROPFIND requests with regard to locking
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
-			return new SupportedLock();
-		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
-			return new LockDiscovery([]);
-		});
-	}
+    /**
+     * Return some dummy response for PROPFIND requests with regard to locking
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $propFind->handle('{DAV:}supportedlock', function () {
+            return new SupportedLock();
+        });
+        $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+            return new LockDiscovery([]);
+        });
+    }
 
-	/**
-	 * Mark a locking token always as valid
-	 *
-	 * @param RequestInterface $request
-	 * @param array $conditions
-	 */
-	public function validateTokens(RequestInterface $request, &$conditions) {
-		foreach ($conditions as &$fileCondition) {
-			if (isset($fileCondition['tokens'])) {
-				foreach ($fileCondition['tokens'] as &$token) {
-					if (isset($token['token'])) {
-						if (str_starts_with($token['token'], 'opaquelocktoken:')) {
-							$token['validToken'] = true;
-						}
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Mark a locking token always as valid
+     *
+     * @param RequestInterface $request
+     * @param array $conditions
+     */
+    public function validateTokens(RequestInterface $request, &$conditions) {
+        foreach ($conditions as &$fileCondition) {
+            if (isset($fileCondition['tokens'])) {
+                foreach ($fileCondition['tokens'] as &$token) {
+                    if (isset($token['token'])) {
+                        if (str_starts_with($token['token'], 'opaquelocktoken:')) {
+                            $token['validToken'] = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeLockProvider(RequestInterface $request,
-		ResponseInterface $response) {
-		$lockInfo = new LockInfo();
-		$lockInfo->token = md5($request->getPath());
-		$lockInfo->uri = $request->getPath();
-		$lockInfo->depth = Server::DEPTH_INFINITY;
-		$lockInfo->timeout = 1800;
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeLockProvider(RequestInterface $request,
+        ResponseInterface $response) {
+        $lockInfo = new LockInfo();
+        $lockInfo->token = md5($request->getPath());
+        $lockInfo->uri = $request->getPath();
+        $lockInfo->depth = Server::DEPTH_INFINITY;
+        $lockInfo->timeout = 1800;
 
-		$body = $this->server->xml->write('{DAV:}prop', [
-			'{DAV:}lockdiscovery' =>
-					new LockDiscovery([$lockInfo])
-		]);
+        $body = $this->server->xml->write('{DAV:}prop', [
+            '{DAV:}lockdiscovery' =>
+                    new LockDiscovery([$lockInfo])
+        ]);
 
-		$response->setStatus(Http::STATUS_OK);
-		$response->setBody($body);
+        $response->setStatus(Http::STATUS_OK);
+        $response->setBody($body);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeUnlockProvider(RequestInterface $request,
-		ResponseInterface $response) {
-		$response->setStatus(Http::STATUS_NO_CONTENT);
-		$response->setHeader('Content-Length', '0');
-		return false;
-	}
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeUnlockProvider(RequestInterface $request,
+        ResponseInterface $response) {
+        $response->setStatus(Http::STATUS_NO_CONTENT);
+        $response->setHeader('Content-Length', '0');
+        return false;
+    }
 }

apps/files_sharing/lib/Capabilities.php

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 			$res['group'] = [];
 			$res['group']['enabled'] = $this->shareManager->allowGroupSharing();
 			$res['group']['expire_date']['enabled'] = true;
-			$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL);
+			$res['default_permissions'] = (int) $this->config->getAppValue('core', 'shareapi_default_permissions', (string) Constants::PERMISSION_ALL);
 		}
 
 		//Federated sharing

Indentation +158 added lines, -158 removed lines

@@ -18,162 +18,162 @@
  */
 class Capabilities implements ICapability {
 
-	public function __construct(
-		private IConfig $config,
-		private IManager $shareManager,
-	) {
-	}
-
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array{
-	 *     files_sharing: array{
-	 *         api_enabled: bool,
-	 *         public: array{
-	 *             enabled: bool,
-	 *             password?: array{
-	 *                 enforced: bool,
-	 *                 askForOptionalPassword: bool
-	 *             },
-	 *     		   multiple_links?: bool,
-	 *             expire_date?: array{
-	 *                 enabled: bool,
-	 *                 days?: int,
-	 *                 enforced?: bool,
-	 *             },
-	 *             expire_date_internal?: array{
-	 *                 enabled: bool,
-	 *                 days?: int,
-	 *                 enforced?: bool,
-	 *             },
-	 *             expire_date_remote?: array{
-	 *                 enabled: bool,
-	 *                 days?: int,
-	 *                 enforced?: bool,
-	 *             },
-	 *             send_mail?: bool,
-	 *             upload?: bool,
-	 *             upload_files_drop?: bool,
-	 *             custom_tokens?: bool,
-	 *         },
-	 *         user: array{
-	 *             send_mail: bool,
-	 *             expire_date?: array{
-	 *                 enabled: bool,
-	 *             },
-	 *         },
-	 *         resharing: bool,
-	 *         group_sharing?: bool,
-	 *         group?: array{
-	 *             enabled: bool,
-	 *             expire_date?: array{
-	 *                 enabled: bool,
-	 *             },
-	 *         },
-	 *         default_permissions?: int,
-	 *         federation: array{
-	 *             outgoing: bool,
-	 *             incoming: bool,
-	 *             expire_date: array{
-	 *                 enabled: bool,
-	 *             },
-	 *             expire_date_supported: array{
-	 *                 enabled: bool,
-	 *             },
-	 *         },
-	 *         sharee: array{
-	 *             query_lookup_default: bool,
-	 *             always_show_unique: bool,
-	 *         },
-	 *	   },
-	 * }
-	 */
-	public function getCapabilities() {
-		$res = [];
-
-		if (!$this->shareManager->shareApiEnabled()) {
-			$res['api_enabled'] = false;
-			$res['public'] = ['enabled' => false];
-			$res['user'] = ['send_mail' => false];
-			$res['resharing'] = false;
-		} else {
-			$res['api_enabled'] = true;
-
-			$public = [];
-			$public['enabled'] = $this->shareManager->shareApiAllowLinks();
-			if ($public['enabled']) {
-				$public['password'] = [];
-				$public['password']['enforced'] = $this->shareManager->shareApiLinkEnforcePassword();
-
-				if ($public['password']['enforced']) {
-					$public['password']['askForOptionalPassword'] = false;
-				} else {
-					$public['password']['askForOptionalPassword'] = ($this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no') === 'yes');
-				}
-
-				$public['expire_date'] = [];
-				$public['multiple_links'] = true;
-				$public['expire_date']['enabled'] = $this->shareManager->shareApiLinkDefaultExpireDate();
-				if ($public['expire_date']['enabled']) {
-					$public['expire_date']['days'] = $this->shareManager->shareApiLinkDefaultExpireDays();
-					$public['expire_date']['enforced'] = $this->shareManager->shareApiLinkDefaultExpireDateEnforced();
-				}
-
-				$public['expire_date_internal'] = [];
-				$public['expire_date_internal']['enabled'] = $this->shareManager->shareApiInternalDefaultExpireDate();
-				if ($public['expire_date_internal']['enabled']) {
-					$public['expire_date_internal']['days'] = $this->shareManager->shareApiInternalDefaultExpireDays();
-					$public['expire_date_internal']['enforced'] = $this->shareManager->shareApiInternalDefaultExpireDateEnforced();
-				}
-
-				$public['expire_date_remote'] = [];
-				$public['expire_date_remote']['enabled'] = $this->shareManager->shareApiRemoteDefaultExpireDate();
-				if ($public['expire_date_remote']['enabled']) {
-					$public['expire_date_remote']['days'] = $this->shareManager->shareApiRemoteDefaultExpireDays();
-					$public['expire_date_remote']['enforced'] = $this->shareManager->shareApiRemoteDefaultExpireDateEnforced();
-				}
-
-				$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
-				$public['upload'] = $this->shareManager->shareApiLinkAllowPublicUpload();
-				$public['upload_files_drop'] = $public['upload'];
-				$public['custom_tokens'] = $this->shareManager->allowCustomTokens();
-			}
-			$res['public'] = $public;
-
-			$res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
-
-			$res['user']['send_mail'] = false;
-			$res['user']['expire_date']['enabled'] = true;
-
-			// deprecated in favour of 'group', but we need to keep it for now
-			// in order to stay compatible with older clients
-			$res['group_sharing'] = $this->shareManager->allowGroupSharing();
-
-			$res['group'] = [];
-			$res['group']['enabled'] = $this->shareManager->allowGroupSharing();
-			$res['group']['expire_date']['enabled'] = true;
-			$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL);
-		}
-
-		//Federated sharing
-		$res['federation'] = [
-			'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(),
-			'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
-			// old bogus one, expire_date was not working before, keeping for compatibility
-			'expire_date' => ['enabled' => true],
-			// the real deal, signifies that expiration date can be set on federated shares
-			'expire_date_supported' => ['enabled' => true],
-		];
-
-		// Sharee searches
-		$res['sharee'] = [
-			'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false),
-			'always_show_unique' => $this->config->getAppValue('files_sharing', 'always_show_unique', 'yes') === 'yes',
-		];
-
-		return [
-			'files_sharing' => $res,
-		];
-	}
+    public function __construct(
+        private IConfig $config,
+        private IManager $shareManager,
+    ) {
+    }
+
+    /**
+     * Return this classes capabilities
+     *
+     * @return array{
+     *     files_sharing: array{
+     *         api_enabled: bool,
+     *         public: array{
+     *             enabled: bool,
+     *             password?: array{
+     *                 enforced: bool,
+     *                 askForOptionalPassword: bool
+     *             },
+     *     		   multiple_links?: bool,
+     *             expire_date?: array{
+     *                 enabled: bool,
+     *                 days?: int,
+     *                 enforced?: bool,
+     *             },
+     *             expire_date_internal?: array{
+     *                 enabled: bool,
+     *                 days?: int,
+     *                 enforced?: bool,
+     *             },
+     *             expire_date_remote?: array{
+     *                 enabled: bool,
+     *                 days?: int,
+     *                 enforced?: bool,
+     *             },
+     *             send_mail?: bool,
+     *             upload?: bool,
+     *             upload_files_drop?: bool,
+     *             custom_tokens?: bool,
+     *         },
+     *         user: array{
+     *             send_mail: bool,
+     *             expire_date?: array{
+     *                 enabled: bool,
+     *             },
+     *         },
+     *         resharing: bool,
+     *         group_sharing?: bool,
+     *         group?: array{
+     *             enabled: bool,
+     *             expire_date?: array{
+     *                 enabled: bool,
+     *             },
+     *         },
+     *         default_permissions?: int,
+     *         federation: array{
+     *             outgoing: bool,
+     *             incoming: bool,
+     *             expire_date: array{
+     *                 enabled: bool,
+     *             },
+     *             expire_date_supported: array{
+     *                 enabled: bool,
+     *             },
+     *         },
+     *         sharee: array{
+     *             query_lookup_default: bool,
+     *             always_show_unique: bool,
+     *         },
+     *	   },
+     * }
+     */
+    public function getCapabilities() {
+        $res = [];
+
+        if (!$this->shareManager->shareApiEnabled()) {
+            $res['api_enabled'] = false;
+            $res['public'] = ['enabled' => false];
+            $res['user'] = ['send_mail' => false];
+            $res['resharing'] = false;
+        } else {
+            $res['api_enabled'] = true;
+
+            $public = [];
+            $public['enabled'] = $this->shareManager->shareApiAllowLinks();
+            if ($public['enabled']) {
+                $public['password'] = [];
+                $public['password']['enforced'] = $this->shareManager->shareApiLinkEnforcePassword();
+
+                if ($public['password']['enforced']) {
+                    $public['password']['askForOptionalPassword'] = false;
+                } else {
+                    $public['password']['askForOptionalPassword'] = ($this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no') === 'yes');
+                }
+
+                $public['expire_date'] = [];
+                $public['multiple_links'] = true;
+                $public['expire_date']['enabled'] = $this->shareManager->shareApiLinkDefaultExpireDate();
+                if ($public['expire_date']['enabled']) {
+                    $public['expire_date']['days'] = $this->shareManager->shareApiLinkDefaultExpireDays();
+                    $public['expire_date']['enforced'] = $this->shareManager->shareApiLinkDefaultExpireDateEnforced();
+                }
+
+                $public['expire_date_internal'] = [];
+                $public['expire_date_internal']['enabled'] = $this->shareManager->shareApiInternalDefaultExpireDate();
+                if ($public['expire_date_internal']['enabled']) {
+                    $public['expire_date_internal']['days'] = $this->shareManager->shareApiInternalDefaultExpireDays();
+                    $public['expire_date_internal']['enforced'] = $this->shareManager->shareApiInternalDefaultExpireDateEnforced();
+                }
+
+                $public['expire_date_remote'] = [];
+                $public['expire_date_remote']['enabled'] = $this->shareManager->shareApiRemoteDefaultExpireDate();
+                if ($public['expire_date_remote']['enabled']) {
+                    $public['expire_date_remote']['days'] = $this->shareManager->shareApiRemoteDefaultExpireDays();
+                    $public['expire_date_remote']['enforced'] = $this->shareManager->shareApiRemoteDefaultExpireDateEnforced();
+                }
+
+                $public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
+                $public['upload'] = $this->shareManager->shareApiLinkAllowPublicUpload();
+                $public['upload_files_drop'] = $public['upload'];
+                $public['custom_tokens'] = $this->shareManager->allowCustomTokens();
+            }
+            $res['public'] = $public;
+
+            $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
+
+            $res['user']['send_mail'] = false;
+            $res['user']['expire_date']['enabled'] = true;
+
+            // deprecated in favour of 'group', but we need to keep it for now
+            // in order to stay compatible with older clients
+            $res['group_sharing'] = $this->shareManager->allowGroupSharing();
+
+            $res['group'] = [];
+            $res['group']['enabled'] = $this->shareManager->allowGroupSharing();
+            $res['group']['expire_date']['enabled'] = true;
+            $res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL);
+        }
+
+        //Federated sharing
+        $res['federation'] = [
+            'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(),
+            'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
+            // old bogus one, expire_date was not working before, keeping for compatibility
+            'expire_date' => ['enabled' => true],
+            // the real deal, signifies that expiration date can be set on federated shares
+            'expire_date_supported' => ['enabled' => true],
+        ];
+
+        // Sharee searches
+        $res['sharee'] = [
+            'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false),
+            'always_show_unique' => $this->config->getAppValue('files_sharing', 'always_show_unique', 'yes') === 'yes',
+        ];
+
+        return [
+            'files_sharing' => $res,
+        ];
+    }
 }

apps/files_external/lib/Lib/Auth/AuthMechanism.php

Indentation +56 added lines, -56 removed lines

@@ -53,69 +53,69 @@
  *      Object can affect storage mounting
  */
 class AuthMechanism implements \JsonSerializable, IIdentifier, IFrontendDefinition {
-	/** Standard authentication schemes */
-	public const SCHEME_NULL = 'null';
-	public const SCHEME_BUILTIN = 'builtin';
-	public const SCHEME_PASSWORD = 'password';
-	public const SCHEME_OAUTH1 = 'oauth1';
-	public const SCHEME_OAUTH2 = 'oauth2';
-	public const SCHEME_PUBLICKEY = 'publickey';
-	public const SCHEME_OPENSTACK = 'openstack';
-	public const SCHEME_SMB = 'smb';
+    /** Standard authentication schemes */
+    public const SCHEME_NULL = 'null';
+    public const SCHEME_BUILTIN = 'builtin';
+    public const SCHEME_PASSWORD = 'password';
+    public const SCHEME_OAUTH1 = 'oauth1';
+    public const SCHEME_OAUTH2 = 'oauth2';
+    public const SCHEME_PUBLICKEY = 'publickey';
+    public const SCHEME_OPENSTACK = 'openstack';
+    public const SCHEME_SMB = 'smb';
 
-	use VisibilityTrait;
-	use FrontendDefinitionTrait;
-	use StorageModifierTrait;
-	use IdentifierTrait;
+    use VisibilityTrait;
+    use FrontendDefinitionTrait;
+    use StorageModifierTrait;
+    use IdentifierTrait;
 
-	/** @var string */
-	protected $scheme;
+    /** @var string */
+    protected $scheme;
 
-	/**
-	 * Get the authentication scheme implemented
-	 * See self::SCHEME_* constants
-	 *
-	 * @return string
-	 */
-	public function getScheme() {
-		return $this->scheme;
-	}
+    /**
+     * Get the authentication scheme implemented
+     * See self::SCHEME_* constants
+     *
+     * @return string
+     */
+    public function getScheme() {
+        return $this->scheme;
+    }
 
-	/**
-	 * @param string $scheme
-	 * @return $this
-	 */
-	public function setScheme($scheme) {
-		$this->scheme = $scheme;
-		return $this;
-	}
+    /**
+     * @param string $scheme
+     * @return $this
+     */
+    public function setScheme($scheme) {
+        $this->scheme = $scheme;
+        return $this;
+    }
 
-	/**
-	 * Serialize into JSON for client-side JS
-	 */
-	public function jsonSerialize(): array {
-		$data = $this->jsonSerializeDefinition();
-		$data += $this->jsonSerializeIdentifier();
+    /**
+     * Serialize into JSON for client-side JS
+     */
+    public function jsonSerialize(): array {
+        $data = $this->jsonSerializeDefinition();
+        $data += $this->jsonSerializeIdentifier();
 
-		$data['scheme'] = $this->getScheme();
-		$data['visibility'] = $this->getVisibility();
+        $data['scheme'] = $this->getScheme();
+        $data['visibility'] = $this->getVisibility();
 
-		return $data;
-	}
+        return $data;
+    }
 
-	/**
-	 * Check if parameters are satisfied in a StorageConfig
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	public function validateStorage(StorageConfig $storage) {
-		// does the backend actually support this scheme
-		$supportedSchemes = $storage->getBackend()->getAuthSchemes();
-		if (!isset($supportedSchemes[$this->getScheme()])) {
-			return false;
-		}
+    /**
+     * Check if parameters are satisfied in a StorageConfig
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    public function validateStorage(StorageConfig $storage) {
+        // does the backend actually support this scheme
+        $supportedSchemes = $storage->getBackend()->getAuthSchemes();
+        if (!isset($supportedSchemes[$this->getScheme()])) {
+            return false;
+        }
 
-		return $this->validateStorageDefinition($storage);
-	}
+        return $this->validateStorageDefinition($storage);
+    }
 }