nextcloud / server

core/templates/loginflowv2/authpicker.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+			'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 			\OCP\Util::sanitizeHTML($_['instanceName'])
 		])) ?>
 	</p>

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<div class="notecard warning">

apps/files_trashbin/lib/Sabre/TrashFolderFile.php

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFolderFile extends AbstractTrashFile {
-	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
-	}
+    public function get() {
+        return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
+    }
 }

lib/private/Authentication/Token/INamedToken.php

Indentation +7 added lines, -7 removed lines

@@ -28,11 +28,11 @@
 namespace OC\Authentication\Token;
 
 interface INamedToken extends IToken {
-	/**
-	 * Set token name
-	 *
-	 * @param string $name
-	 * @return void
-	 */
-	public function setName(string $name): void;
+    /**
+     * Set token name
+     *
+     * @param string $name
+     * @return void
+     */
+    public function setName(string $name): void;
 }

apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 	 * @return boolean
 	 */
 	public function isActive(IUser $user): bool {
-		$appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function ($appId) {
+		$appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function($appId) {
 			return $appId !== $this->appName;
 		});
 		foreach ($appIds as $appId) {

Indentation +97 added lines, -97 removed lines

@@ -21,110 +21,110 @@
 use OCP\Template\ITemplateManager;
 
 class BackupCodesProvider implements IDeactivatableByAdmin, IProvidesPersonalSettings {
-	public function __construct(
-		private string $appName,
-		private BackupCodeStorage $storage,
-		private IL10N $l10n,
-		private AppManager $appManager,
-		private IInitialState $initialState,
-		private ITemplateManager $templateManager,
-	) {
-	}
+    public function __construct(
+        private string $appName,
+        private BackupCodeStorage $storage,
+        private IL10N $l10n,
+        private AppManager $appManager,
+        private IInitialState $initialState,
+        private ITemplateManager $templateManager,
+    ) {
+    }
 
-	/**
-	 * Get unique identifier of this 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getId(): string {
-		return 'backup_codes';
-	}
+    /**
+     * Get unique identifier of this 2FA provider
+     *
+     * @return string
+     */
+    public function getId(): string {
+        return 'backup_codes';
+    }
 
-	/**
-	 * Get the display name for selecting the 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Backup code');
-	}
+    /**
+     * Get the display name for selecting the 2FA provider
+     *
+     * @return string
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Backup code');
+    }
 
-	/**
-	 * Get the description for selecting the 2FA provider
-	 *
-	 * @return string
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Use backup code');
-	}
+    /**
+     * Get the description for selecting the 2FA provider
+     *
+     * @return string
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Use backup code');
+    }
 
-	/**
-	 * Get the template for rending the 2FA provider view
-	 *
-	 * @param IUser $user
-	 * @return ITemplate
-	 */
-	public function getTemplate(IUser $user): ITemplate {
-		return $this->templateManager->getTemplate('twofactor_backupcodes', 'challenge');
-	}
+    /**
+     * Get the template for rending the 2FA provider view
+     *
+     * @param IUser $user
+     * @return ITemplate
+     */
+    public function getTemplate(IUser $user): ITemplate {
+        return $this->templateManager->getTemplate('twofactor_backupcodes', 'challenge');
+    }
 
-	/**
-	 * Verify the given challenge
-	 *
-	 * @param IUser $user
-	 * @param string $challenge
-	 * @return bool
-	 */
-	public function verifyChallenge(IUser $user, string $challenge): bool {
-		return $this->storage->validateCode($user, $challenge);
-	}
+    /**
+     * Verify the given challenge
+     *
+     * @param IUser $user
+     * @param string $challenge
+     * @return bool
+     */
+    public function verifyChallenge(IUser $user, string $challenge): bool {
+        return $this->storage->validateCode($user, $challenge);
+    }
 
-	/**
-	 * Decides whether 2FA is enabled for the given user
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isTwoFactorAuthEnabledForUser(IUser $user): bool {
-		return $this->storage->hasBackupCodes($user);
-	}
+    /**
+     * Decides whether 2FA is enabled for the given user
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isTwoFactorAuthEnabledForUser(IUser $user): bool {
+        return $this->storage->hasBackupCodes($user);
+    }
 
-	/**
-	 * Determine whether backup codes should be active or not
-	 *
-	 * Backup codes only make sense if at least one 2FA provider is active,
-	 * hence this method checks all enabled apps on whether they provide 2FA
-	 * functionality or not. If there's at least one app, backup codes are
-	 * enabled on the personal settings page.
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isActive(IUser $user): bool {
-		$appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function ($appId) {
-			return $appId !== $this->appName;
-		});
-		foreach ($appIds as $appId) {
-			$info = $this->appManager->getAppInfo($appId);
-			if (isset($info['two-factor-providers']) && count($info['two-factor-providers']) > 0) {
-				return true;
-			}
-		}
-		return false;
-	}
+    /**
+     * Determine whether backup codes should be active or not
+     *
+     * Backup codes only make sense if at least one 2FA provider is active,
+     * hence this method checks all enabled apps on whether they provide 2FA
+     * functionality or not. If there's at least one app, backup codes are
+     * enabled on the personal settings page.
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isActive(IUser $user): bool {
+        $appIds = array_filter($this->appManager->getEnabledAppsForUser($user), function ($appId) {
+            return $appId !== $this->appName;
+        });
+        foreach ($appIds as $appId) {
+            $info = $this->appManager->getAppInfo($appId);
+            if (isset($info['two-factor-providers']) && count($info['two-factor-providers']) > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * @param IUser $user
-	 *
-	 * @return IPersonalProviderSettings
-	 */
-	public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
-		$state = $this->storage->getBackupCodesState($user);
-		$this->initialState->provideInitialState('state', $state);
-		return new Personal();
-	}
+    /**
+     * @param IUser $user
+     *
+     * @return IPersonalProviderSettings
+     */
+    public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
+        $state = $this->storage->getBackupCodesState($user);
+        $this->initialState->provideInitialState('state', $state);
+        return new Personal();
+    }
 
-	public function disableFor(IUser $user): void {
-		$this->storage->deleteCodes($user);
-	}
+    public function disableFor(IUser $user): void {
+        $this->storage->deleteCodes($user);
+    }
 }

lib/private/Authentication/TwoFactorAuth/ProviderSet.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	 * @return IProvider[]
 	 */
 	public function getPrimaryProviders(): array {
-		return array_filter($this->providers, function (IProvider $provider) {
+		return array_filter($this->providers, function(IProvider $provider) {
 			return !($provider instanceof BackupCodesProvider);
 		});
 	}

Indentation +39 added lines, -39 removed lines

@@ -33,49 +33,49 @@
  * Contains all two-factor provider information for the two-factor login challenge
  */
 class ProviderSet {
-	/** @var IProvider */
-	private $providers;
+    /** @var IProvider */
+    private $providers;
 
-	/** @var bool */
-	private $providerMissing;
+    /** @var bool */
+    private $providerMissing;
 
-	/**
-	 * @param IProvider[] $providers
-	 * @param bool $providerMissing
-	 */
-	public function __construct(array $providers, bool $providerMissing) {
-		$this->providers = [];
-		foreach ($providers as $provider) {
-			$this->providers[$provider->getId()] = $provider;
-		}
-		$this->providerMissing = $providerMissing;
-	}
+    /**
+     * @param IProvider[] $providers
+     * @param bool $providerMissing
+     */
+    public function __construct(array $providers, bool $providerMissing) {
+        $this->providers = [];
+        foreach ($providers as $provider) {
+            $this->providers[$provider->getId()] = $provider;
+        }
+        $this->providerMissing = $providerMissing;
+    }
 
-	/**
-	 * @param string $providerId
-	 * @return IProvider|null
-	 */
-	public function getProvider(string $providerId) {
-		return $this->providers[$providerId] ?? null;
-	}
+    /**
+     * @param string $providerId
+     * @return IProvider|null
+     */
+    public function getProvider(string $providerId) {
+        return $this->providers[$providerId] ?? null;
+    }
 
-	/**
-	 * @return IProvider[]
-	 */
-	public function getProviders(): array {
-		return $this->providers;
-	}
+    /**
+     * @return IProvider[]
+     */
+    public function getProviders(): array {
+        return $this->providers;
+    }
 
-	/**
-	 * @return IProvider[]
-	 */
-	public function getPrimaryProviders(): array {
-		return array_filter($this->providers, function (IProvider $provider) {
-			return !($provider instanceof BackupCodesProvider);
-		});
-	}
+    /**
+     * @return IProvider[]
+     */
+    public function getPrimaryProviders(): array {
+        return array_filter($this->providers, function (IProvider $provider) {
+            return !($provider instanceof BackupCodesProvider);
+        });
+    }
 
-	public function isProviderMissing(): bool {
-		return $this->providerMissing;
-	}
+    public function isProviderMissing(): bool {
+        return $this->providerMissing;
+    }
 }

lib/private/Collaboration/Resources/Collection.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 	 * @since 16.0.0
 	 */
 	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
+		array_map(function(IResource $r) use ($resource) {
 			if ($this->isSameResource($r, $resource)) {
 				throw new ResourceException('Already part of the collection');
 			}
@@ -158,7 +158,7 @@ 
 	 * @since 16.0.0
 	 */
 	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+		$this->resources = array_filter($this->getResources(), function(IResource $r) use ($resource) {
 			return !$this->isSameResource($r, $resource);
 		});
 

Indentation +159 added lines, -159 removed lines

@@ -18,163 +18,163 @@
 use OCP\IUser;
 
 class Collection implements ICollection {
-	/** @var IResource[] */
-	protected array $resources = [];
-
-	public function __construct(
-		/** @var Manager $manager */
-		protected IManager $manager,
-		protected IDBConnection $connection,
-		protected int $id,
-		protected string $name,
-		protected ?IUser $userForAccess = null,
-		protected ?bool $access = null,
-	) {
-	}
-
-	/**
-	 * @since 16.0.0
-	 */
-	public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @since 16.0.0
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * @since 16.0.0
-	 */
-	public function setName(string $name): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update(Manager::TABLE_COLLECTIONS)
-			->set('name', $query->createNamedParameter($name))
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$this->name = $name;
-	}
-
-	/**
-	 * @return IResource[]
-	 * @since 16.0.0
-	 */
-	public function getResources(): array {
-		if (empty($this->resources)) {
-			$this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
-		}
-
-		return $this->resources;
-	}
-
-	/**
-	 * Adds a resource to a collection
-	 *
-	 * @throws ResourceException when the resource is already part of the collection
-	 * @since 16.0.0
-	 */
-	public function addResource(IResource $resource): void {
-		array_map(function (IResource $r) use ($resource) {
-			if ($this->isSameResource($r, $resource)) {
-				throw new ResourceException('Already part of the collection');
-			}
-		}, $this->getResources());
-
-		$this->resources[] = $resource;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(Manager::TABLE_RESOURCES)
-			->values([
-				'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
-				'resource_type' => $query->createNamedParameter($resource->getType()),
-				'resource_id' => $query->createNamedParameter($resource->getId()),
-			]);
-
-		try {
-			$query->executeStatement();
-		} catch (ConstraintViolationException $e) {
-			throw new ResourceException('Already part of the collection');
-		}
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-	}
-
-	/**
-	 * Removes a resource from a collection
-	 *
-	 * @since 16.0.0
-	 */
-	public function removeResource(IResource $resource): void {
-		$this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
-			return !$this->isSameResource($r, $resource);
-		});
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_RESOURCES)
-			->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
-		$query->executeStatement();
-
-		if (empty($this->resources)) {
-			$this->removeCollection();
-		} else {
-			$this->manager->invalidateAccessCacheForCollection($this);
-		}
-	}
-
-	/**
-	 * Can a user/guest access the collection
-	 *
-	 * @since 16.0.0
-	 */
-	public function canAccess(?IUser $user): bool {
-		if ($user instanceof IUser) {
-			return $this->canUserAccess($user);
-		}
-		return $this->canGuestAccess();
-	}
-
-	protected function canUserAccess(IUser $user): bool {
-		if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, $user);
-		if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function canGuestAccess(): bool {
-		if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
-			return $this->access;
-		}
-
-		$access = $this->manager->canAccessCollection($this, null);
-		if (!$this->userForAccess instanceof IUser) {
-			$this->access = $access;
-		}
-		return $access;
-	}
-
-	protected function isSameResource(IResource $resource1, IResource $resource2): bool {
-		return $resource1->getType() === $resource2->getType()
-			&& $resource1->getId() === $resource2->getId();
-	}
-
-	protected function removeCollection(): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(Manager::TABLE_COLLECTIONS)
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$this->manager->invalidateAccessCacheForCollection($this);
-		$this->id = 0;
-	}
+    /** @var IResource[] */
+    protected array $resources = [];
+
+    public function __construct(
+        /** @var Manager $manager */
+        protected IManager $manager,
+        protected IDBConnection $connection,
+        protected int $id,
+        protected string $name,
+        protected ?IUser $userForAccess = null,
+        protected ?bool $access = null,
+    ) {
+    }
+
+    /**
+     * @since 16.0.0
+     */
+    public function getId(): int {
+        return $this->id;
+    }
+
+    /**
+     * @since 16.0.0
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * @since 16.0.0
+     */
+    public function setName(string $name): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update(Manager::TABLE_COLLECTIONS)
+            ->set('name', $query->createNamedParameter($name))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $this->name = $name;
+    }
+
+    /**
+     * @return IResource[]
+     * @since 16.0.0
+     */
+    public function getResources(): array {
+        if (empty($this->resources)) {
+            $this->resources = $this->manager->getResourcesByCollectionForUser($this, $this->userForAccess);
+        }
+
+        return $this->resources;
+    }
+
+    /**
+     * Adds a resource to a collection
+     *
+     * @throws ResourceException when the resource is already part of the collection
+     * @since 16.0.0
+     */
+    public function addResource(IResource $resource): void {
+        array_map(function (IResource $r) use ($resource) {
+            if ($this->isSameResource($r, $resource)) {
+                throw new ResourceException('Already part of the collection');
+            }
+        }, $this->getResources());
+
+        $this->resources[] = $resource;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(Manager::TABLE_RESOURCES)
+            ->values([
+                'collection_id' => $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT),
+                'resource_type' => $query->createNamedParameter($resource->getType()),
+                'resource_id' => $query->createNamedParameter($resource->getId()),
+            ]);
+
+        try {
+            $query->executeStatement();
+        } catch (ConstraintViolationException $e) {
+            throw new ResourceException('Already part of the collection');
+        }
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+    }
+
+    /**
+     * Removes a resource from a collection
+     *
+     * @since 16.0.0
+     */
+    public function removeResource(IResource $resource): void {
+        $this->resources = array_filter($this->getResources(), function (IResource $r) use ($resource) {
+            return !$this->isSameResource($r, $resource);
+        });
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_RESOURCES)
+            ->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
+        $query->executeStatement();
+
+        if (empty($this->resources)) {
+            $this->removeCollection();
+        } else {
+            $this->manager->invalidateAccessCacheForCollection($this);
+        }
+    }
+
+    /**
+     * Can a user/guest access the collection
+     *
+     * @since 16.0.0
+     */
+    public function canAccess(?IUser $user): bool {
+        if ($user instanceof IUser) {
+            return $this->canUserAccess($user);
+        }
+        return $this->canGuestAccess();
+    }
+
+    protected function canUserAccess(IUser $user): bool {
+        if (\is_bool($this->access) && $this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, $user);
+        if ($this->userForAccess instanceof IUser && $user->getUID() === $this->userForAccess->getUID()) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function canGuestAccess(): bool {
+        if (\is_bool($this->access) && !$this->userForAccess instanceof IUser) {
+            return $this->access;
+        }
+
+        $access = $this->manager->canAccessCollection($this, null);
+        if (!$this->userForAccess instanceof IUser) {
+            $this->access = $access;
+        }
+        return $access;
+    }
+
+    protected function isSameResource(IResource $resource1, IResource $resource2): bool {
+        return $resource1->getType() === $resource2->getType()
+            && $resource1->getId() === $resource2->getId();
+    }
+
+    protected function removeCollection(): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(Manager::TABLE_COLLECTIONS)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $this->manager->invalidateAccessCacheForCollection($this);
+        $this->id = 0;
+    }
 }

lib/public/Accounts/PropertyDoesNotExistException.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 * @since 15.0.0
 	 */
 	public function __construct($property) {
-		parent::__construct('Property ' . $property . ' does not exist.');
+		parent::__construct('Property '.$property.' does not exist.');
 	}
 
 }

Indentation +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@
  *
  */
 class PropertyDoesNotExistException extends \Exception {
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 15.0.0
-	 */
-	public function __construct($property) {
-		parent::__construct('Property ' . $property . ' does not exist.');
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 15.0.0
+     */
+    public function __construct($property) {
+        parent::__construct('Property ' . $property . ' does not exist.');
+    }
 }

lib/private/Collaboration/Collaborators/RemotePlugin.php

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
 							$searchResult->markExactIdMatch($resultType);
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'uuid' => $contact['UID'],
 							'name' => $contact['FN'],
 							'type' => $cloudIdType,
@@ -124,7 +124,7 @@ 
 						];
 					} else {
 						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'uuid' => $contact['UID'],
 							'name' => $contact['FN'],
 							'type' => $cloudIdType,
@@ -154,7 +154,7 @@ 
 				$localUser = $this->userManager->get($remoteUser);
 				if ($localUser === null || $search !== $localUser->getCloudId()) {
 					$result['exact'][] = [
-						'label' => $remoteUser . " ($serverUrl)",
+						'label' => $remoteUser." ($serverUrl)",
 						'uuid' => $remoteUser,
 						'name' => $remoteUser,
 						'value' => [

Indentation +144 added lines, -144 removed lines

@@ -19,160 +19,160 @@
 use OCP\Share\IShare;
 
 class RemotePlugin implements ISearchPlugin {
-	protected bool $shareeEnumeration;
+    protected bool $shareeEnumeration;
 
-	private string $userId;
+    private string $userId;
 
-	public function __construct(
-		private IManager $contactsManager,
-		private ICloudIdManager $cloudIdManager,
-		private IConfig $config,
-		private IUserManager $userManager,
-		IUserSession $userSession,
-		private IAppConfig $appConfig,
-		private ?TrustedServers $trustedServers,
-	) {
-		$this->userId = $userSession->getUser()?->getUID() ?? '';
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
+    public function __construct(
+        private IManager $contactsManager,
+        private ICloudIdManager $cloudIdManager,
+        private IConfig $config,
+        private IUserManager $userManager,
+        IUserSession $userSession,
+        private IAppConfig $appConfig,
+        private ?TrustedServers $trustedServers,
+    ) {
+        $this->userId = $userSession->getUser()?->getUID() ?? '';
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
 
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remotes');
+    public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remotes');
 
-		// Search in contacts
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN', 'EMAIL'], [
-			'limit' => $limit,
-			'offset' => $offset,
-			'enumeration' => false,
-			'fullmatch' => false,
-		]);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (is_string($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					$cloudIdType = '';
-					if (\is_array($cloudId)) {
-						$cloudIdData = $cloudId;
-						$cloudId = $cloudIdData['value'];
-						$cloudIdType = $cloudIdData['type'];
-					}
-					try {
-						[$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
-					} catch (\InvalidArgumentException $e) {
-						continue;
-					}
+        // Search in contacts
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN', 'EMAIL'], [
+            'limit' => $limit,
+            'offset' => $offset,
+            'enumeration' => false,
+            'fullmatch' => false,
+        ]);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (is_string($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    $cloudIdType = '';
+                    if (\is_array($cloudId)) {
+                        $cloudIdData = $cloudId;
+                        $cloudId = $cloudIdData['value'];
+                        $cloudIdType = $cloudIdData['type'];
+                    }
+                    try {
+                        [$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
+                    } catch (\InvalidArgumentException $e) {
+                        continue;
+                    }
 
-					$localUser = $this->userManager->get($remoteUser);
-					if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
-						$result['wide'][] = [
-							'label' => $contact['FN'],
-							'uuid' => $contact['UID'],
-							'value' => [
-								'shareType' => IShare::TYPE_USER,
-								'shareWith' => $remoteUser
-							],
-							'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
-						];
-					}
+                    $localUser = $this->userManager->get($remoteUser);
+                    if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'],
+                            'uuid' => $contact['UID'],
+                            'value' => [
+                                'shareType' => IShare::TYPE_USER,
+                                'shareWith' => $remoteUser
+                            ],
+                            'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
+                        ];
+                    }
 
-					$emailMatch = false;
-					if (isset($contact['EMAIL'])) {
-						$emails = is_array($contact['EMAIL']) ? $contact['EMAIL'] : [$contact['EMAIL']];
-						foreach ($emails as $email) {
-							if (is_string($email) && strtolower($email) === $lowerSearch) {
-								$emailMatch = true;
-								break;
-							}
-						}
-					}
-					if ($emailMatch || strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$searchResult->markExactIdMatch($resultType);
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $cloudIdType,
-							'value' => [
-								'shareType' => IShare::TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-								'isTrustedServer' => $this->trustedServers?->isTrustedServer($serverUrl) ?? false,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $cloudIdType,
-							'value' => [
-								'shareType' => IShare::TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-								'isTrustedServer' => $this->trustedServers?->isTrustedServer($serverUrl) ?? false,
-							],
-						];
-					}
-				}
-			}
-		}
+                    $emailMatch = false;
+                    if (isset($contact['EMAIL'])) {
+                        $emails = is_array($contact['EMAIL']) ? $contact['EMAIL'] : [$contact['EMAIL']];
+                        foreach ($emails as $email) {
+                            if (is_string($email) && strtolower($email) === $lowerSearch) {
+                                $emailMatch = true;
+                                break;
+                            }
+                        }
+                    }
+                    if ($emailMatch || strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $searchResult->markExactIdMatch($resultType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $cloudIdType,
+                            'value' => [
+                                'shareType' => IShare::TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                                'isTrustedServer' => $this->trustedServers?->isTrustedServer($serverUrl) ?? false,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $cloudIdType,
+                            'value' => [
+                                'shareType' => IShare::TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                                'isTrustedServer' => $this->trustedServers?->isTrustedServer($serverUrl) ?? false,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
 
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		} else {
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-		}
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        } else {
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+        }
 
-		if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			try {
-				[$remoteUser, $serverUrl] = $this->splitUserRemote($search);
-				$localUser = $this->userManager->get($remoteUser);
-				if ($localUser === null || $search !== $localUser->getCloudId()) {
-					$result['exact'][] = [
-						'label' => $remoteUser . " ($serverUrl)",
-						'uuid' => $remoteUser,
-						'name' => $remoteUser,
-						'value' => [
-							'shareType' => IShare::TYPE_REMOTE,
-							'shareWith' => $search,
-							'server' => $serverUrl,
-							'isTrustedServer' => $this->trustedServers?->isTrustedServer($serverUrl) ?? false,
-						],
-					];
-				}
-			} catch (\InvalidArgumentException $e) {
-			}
-		}
+        if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            try {
+                [$remoteUser, $serverUrl] = $this->splitUserRemote($search);
+                $localUser = $this->userManager->get($remoteUser);
+                if ($localUser === null || $search !== $localUser->getCloudId()) {
+                    $result['exact'][] = [
+                        'label' => $remoteUser . " ($serverUrl)",
+                        'uuid' => $remoteUser,
+                        'name' => $remoteUser,
+                        'value' => [
+                            'shareType' => IShare::TYPE_REMOTE,
+                            'shareWith' => $search,
+                            'server' => $serverUrl,
+                            'isTrustedServer' => $this->trustedServers?->isTrustedServer($serverUrl) ?? false,
+                        ],
+                    ];
+                }
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitUserRemote(string $address): array {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $this->cloudIdManager->removeProtocolFromUrl($cloudId->getRemote(), true)];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitUserRemote(string $address): array {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $this->cloudIdManager->removeProtocolFromUrl($cloudId->getRemote(), true)];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

lib/private/Color.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC;
 
 class Color {
-	public $r;
-	public $g;
-	public $b;
-	public function __construct($r, $g, $b) {
-		$this->r = $r;
-		$this->g = $g;
-		$this->b = $b;
-	}
+    public $r;
+    public $g;
+    public $b;
+    public function __construct($r, $g, $b) {
+        $this->r = $r;
+        $this->g = $g;
+        $this->b = $b;
+    }
 }