nextcloud / server

apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php

Indentation +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@
  * Amazon S3 access key authentication
  */
 class AccessKey extends AuthMechanism {
-	public const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
+    public const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
 
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('amazons3::accesskey')
-			->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
-			->setText($l->t('Access key'))
-			->addParameters([
-				new DefinitionParameter('key', $l->t('Access key')),
-				(new DefinitionParameter('secret', $l->t('Secret key')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-			]);
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('amazons3::accesskey')
+            ->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
+            ->setText($l->t('Access key'))
+            ->addParameters([
+                new DefinitionParameter('key', $l->t('Access key')),
+                (new DefinitionParameter('secret', $l->t('Secret key')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+            ]);
+    }
 }

apps/files_trashbin/lib/Sabre/AbstractTrashFile.php

Indentation +6 added lines, -6 removed lines

@@ -30,11 +30,11 @@
 use Sabre\DAV\IFile;
 
 abstract class AbstractTrashFile extends AbstractTrash implements IFile, ITrash {
-	public function put($data) {
-		throw new Forbidden();
-	}
+    public function put($data) {
+        throw new Forbidden();
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 }

apps/files_external/lib/Lib/Auth/OpenStack/OpenStackV3.php

Indentation +15 added lines, -15 removed lines

@@ -36,19 +36,19 @@
  * OpenStack Keystone authentication
  */
 class OpenStackV3 extends AuthMechanism {
-	public function __construct(IL10N $l) {
-		$this
-			->setIdentifier('openstack::openstackv3')
-			->setScheme(self::SCHEME_OPENSTACK)
-			->setText($l->t('OpenStack v3'))
-			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
-				new DefinitionParameter('domain', $l->t('Domain')),
-				(new DefinitionParameter('password', $l->t('Password')))
-					->setType(DefinitionParameter::VALUE_PASSWORD),
-				new DefinitionParameter('tenant', $l->t('Tenant name')),
-				new DefinitionParameter('url', $l->t('Identity endpoint URL'))
-			])
-		;
-	}
+    public function __construct(IL10N $l) {
+        $this
+            ->setIdentifier('openstack::openstackv3')
+            ->setScheme(self::SCHEME_OPENSTACK)
+            ->setText($l->t('OpenStack v3'))
+            ->addParameters([
+                new DefinitionParameter('user', $l->t('Username')),
+                new DefinitionParameter('domain', $l->t('Domain')),
+                (new DefinitionParameter('password', $l->t('Password')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD),
+                new DefinitionParameter('tenant', $l->t('Tenant name')),
+                new DefinitionParameter('url', $l->t('Identity endpoint URL'))
+            ])
+        ;
+    }
 }

apps/dav/lib/CardDAV/HasPhotoPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		$ns = '{http://nextcloud.com/ns}';
 
 		if ($node instanceof Card) {
-			$propFind->handle($ns . 'has-photo', function () use ($node) {
+			$propFind->handle($ns.'has-photo', function() use ($node) {
 				$vcard = Reader::read($node->get());
 				return $vcard instanceof VCard
 					&& $vcard->PHOTO

Indentation +60 added lines, -60 removed lines

@@ -38,69 +38,69 @@
 
 class HasPhotoPlugin extends ServerPlugin {
 
-	/** @var Server */
-	protected $server;
+    /** @var Server */
+    protected $server;
 
-	/**
-	 * Initializes the plugin and registers event handlers
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$server->on('propFind', [$this, 'propFind']);
-	}
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $server->on('propFind', [$this, 'propFind']);
+    }
 
-	/**
-	 * Adds all CardDAV-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$ns = '{http://nextcloud.com/ns}';
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $ns = '{http://nextcloud.com/ns}';
 
-		if ($node instanceof Card) {
-			$propFind->handle($ns . 'has-photo', function () use ($node) {
-				$vcard = Reader::read($node->get());
-				return $vcard instanceof VCard
-					&& $vcard->PHOTO
-					// Either the PHOTO is a url (doesn't start with data:) or the mimetype has to start with image/
-					&& (strpos($vcard->PHOTO->getValue(), 'data:') !== 0
-						|| strpos($vcard->PHOTO->getValue(), 'data:image/') === 0)
-				;
-			});
-		}
-	}
+        if ($node instanceof Card) {
+            $propFind->handle($ns . 'has-photo', function () use ($node) {
+                $vcard = Reader::read($node->get());
+                return $vcard instanceof VCard
+                    && $vcard->PHOTO
+                    // Either the PHOTO is a url (doesn't start with data:) or the mimetype has to start with image/
+                    && (strpos($vcard->PHOTO->getValue(), 'data:') !== 0
+                        || strpos($vcard->PHOTO->getValue(), 'data:image/') === 0)
+                ;
+            });
+        }
+    }
 
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using \Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'vcard-has-photo';
-	}
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using \Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'vcard-has-photo';
+    }
 
-	/**
-	 * Returns a bunch of meta-data about the plugin.
-	 *
-	 * Providing this information is optional, and is mainly displayed by the
-	 * Browser plugin.
-	 *
-	 * The description key in the returned array may contain html and will not
-	 * be sanitized.
-	 *
-	 * @return array
-	 */
-	public function getPluginInfo() {
-		return [
-			'name' => $this->getPluginName(),
-			'description' => 'Return a boolean stating if the vcard have a photo property set or not.'
-		];
-	}
+    /**
+     * Returns a bunch of meta-data about the plugin.
+     *
+     * Providing this information is optional, and is mainly displayed by the
+     * Browser plugin.
+     *
+     * The description key in the returned array may contain html and will not
+     * be sanitized.
+     *
+     * @return array
+     */
+    public function getPluginInfo() {
+        return [
+            'name' => $this->getPluginName(),
+            'description' => 'Return a boolean stating if the vcard have a photo property set or not.'
+        ];
+    }
 }

apps/files_versions/appinfo/routes.php

Indentation +10 added lines, -10 removed lines

@@ -30,19 +30,19 @@
 /** @var Application $application */
 $application = \OC::$server->query(Application::class);
 $application->registerRoutes($this, [
-	'routes' => [
-		[
-			'name' => 'Preview#getPreview',
-			'url' => '/preview',
-			'verb' => 'GET',
-		],
-	],
+    'routes' => [
+        [
+            'name' => 'Preview#getPreview',
+            'url' => '/preview',
+            'verb' => 'GET',
+        ],
+    ],
 ]);
 
 /** @var $this \OCP\Route\IRouter */
 $this->create('files_versions_download', 'apps/files_versions/download.php')
-	->actionInclude('files_versions/download.php');
+    ->actionInclude('files_versions/download.php');
 $this->create('files_versions_ajax_getVersions', 'apps/files_versions/ajax/getVersions.php')
-	->actionInclude('files_versions/ajax/getVersions.php');
+    ->actionInclude('files_versions/ajax/getVersions.php');
 $this->create('files_versions_ajax_rollbackVersion', 'apps/files_versions/ajax/rollbackVersion.php')
-	->actionInclude('files_versions/ajax/rollbackVersion.php');
+    ->actionInclude('files_versions/ajax/rollbackVersion.php');

lib/public/AppFramework/AuthPublicShareController.php

Spacing +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 		if (substr($class, -10) === 'Controller') {
 			$class = substr($class, 0, -10);
 		}
-		return $app .'.'. $class .'.'. $function;
+		return $app.'.'.$class.'.'.$function;
 	}
 
 	/**

Indentation +204 added lines, -204 removed lines

@@ -46,208 +46,208 @@
  * @since 14.0.0
  */
 abstract class AuthPublicShareController extends PublicShareController {
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/**
-	 * @since 14.0.0
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								ISession $session,
-								IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request, $session);
-
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * Show the authentication page
-	 * The form has to submit to the authenticate method route
-	 *
-	 * @since 14.0.0
-	 */
-	public function showAuthenticate(): TemplateResponse {
-		return new TemplateResponse('core', 'publicshareauth', [], 'guest');
-	}
-
-	/**
-	 * The template to show when authentication failed
-	 *
-	 * @since 14.0.0
-	 */
-	protected function showAuthFailed(): TemplateResponse {
-		return new TemplateResponse('core', 'publicshareauth', ['wrongpw' => true], 'guest');
-	}
-
-	/**
-	 * The template to show after user identification
-	 *
-	 * @since 24.0.0
-	 */
-	protected function showIdentificationResult(bool $success): TemplateResponse {
-		return new TemplateResponse('core', 'publicshareauth', ['identityOk' => $success], 'guest');
-	}
-
-	/**
-	 * Validates that the provided identity is allowed to receive a temporary password
-	 *
-	 * @since 24.0.0
-	 */
-	protected function validateIdentity(?string $identityToken = null): bool {
-		return false;
-	}
-
-	/**
-	 * Generates a password
-	 *
-	 * @since 24.0.0
-	 */
-	protected function generatePassword(): void {
-	}
-
-	/**
-	 * Verify the password
-	 *
-	 * @since 24.0.0
-	 */
-	protected function verifyPassword(string $password): bool {
-		return false;
-	}
-
-	/**
-	 * Function called after failed authentication
-	 *
-	 * You can use this to do some logging for example
-	 *
-	 * @since 14.0.0
-	 */
-	protected function authFailed() {
-	}
-
-	/**
-	 * Function called after successfull authentication
-	 *
-	 * You can use this to do some logging for example
-	 *
-	 * @since 14.0.0
-	 */
-	protected function authSucceeded() {
-	}
-
-	/**
-	 * @UseSession
-	 * @PublicPage
-	 * @BruteForceProtection(action=publicLinkAuth)
-	 *
-	 * Authenticate the share
-	 *
-	 * @since 14.0.0
-	 */
-	final public function authenticate(string $password = '', string $passwordRequest = 'no', string $identityToken = '') {
-		// Already authenticated
-		if ($this->isAuthenticated()) {
-			return $this->getRedirect();
-		}
-
-		// Is user requesting a temporary password?
-		if ($passwordRequest == '') {
-			if ($this->validateIdentity($identityToken)) {
-				$this->generatePassword();
-				$response = $this->showIdentificationResult(true);
-				return $response;
-			} else {
-				$response = $this->showIdentificationResult(false);
-				$response->throttle();
-				return $response;
-			}
-		}
-
-		if (!$this->verifyPassword($password)) {
-			$this->authFailed();
-			$response = $this->showAuthFailed();
-			$response->throttle();
-			return $response;
-		}
-
-		$this->session->regenerateId(true, true);
-		$response = $this->getRedirect();
-
-		$this->session->set('public_link_authenticated_token', $this->getToken());
-		$this->session->set('public_link_authenticated_password_hash', $this->getPasswordHash());
-
-		$this->authSucceeded();
-
-		return $response;
-	}
-
-	/**
-	 * Default landing page
-	 *
-	 * @since 14.0.0
-	 */
-	abstract public function showShare(): TemplateResponse;
-
-	/**
-	 * @since 14.0.0
-	 */
-	final public function getAuthenticationRedirect(string $redirect): RedirectResponse {
-		return new RedirectResponse(
-			$this->urlGenerator->linkToRoute($this->getRoute('showAuthenticate'), ['token' => $this->getToken(), 'redirect' => $redirect])
-		);
-	}
-
-
-	/**
-	 * @since 14.0.0
-	 */
-	private function getRoute(string $function): string {
-		$app = strtolower($this->appName);
-		$class = (new \ReflectionClass($this))->getShortName();
-		if (substr($class, -10) === 'Controller') {
-			$class = substr($class, 0, -10);
-		}
-		return $app .'.'. $class .'.'. $function;
-	}
-
-	/**
-	 * @since 14.0.0
-	 */
-	private function getRedirect(): RedirectResponse {
-		//Get all the stored redirect parameters:
-		$params = $this->session->get('public_link_authenticate_redirect');
-
-		$route = $this->getRoute('showShare');
-
-		if ($params === null) {
-			$params = [
-				'token' => $this->getToken(),
-			];
-		} else {
-			$params = json_decode($params, true);
-			if (isset($params['_route'])) {
-				$route = $params['_route'];
-				unset($params['_route']);
-			}
-
-			// If the token doesn't match the rest of the arguments can't be trusted either
-			if (isset($params['token']) && $params['token'] !== $this->getToken()) {
-				$params = [
-					'token' => $this->getToken(),
-				];
-			}
-
-			// We need a token
-			if (!isset($params['token'])) {
-				$params = [
-					'token' => $this->getToken(),
-				];
-			}
-		}
-
-		return new RedirectResponse($this->urlGenerator->linkToRoute($route, $params));
-	}
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /**
+     * @since 14.0.0
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                ISession $session,
+                                IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request, $session);
+
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * Show the authentication page
+     * The form has to submit to the authenticate method route
+     *
+     * @since 14.0.0
+     */
+    public function showAuthenticate(): TemplateResponse {
+        return new TemplateResponse('core', 'publicshareauth', [], 'guest');
+    }
+
+    /**
+     * The template to show when authentication failed
+     *
+     * @since 14.0.0
+     */
+    protected function showAuthFailed(): TemplateResponse {
+        return new TemplateResponse('core', 'publicshareauth', ['wrongpw' => true], 'guest');
+    }
+
+    /**
+     * The template to show after user identification
+     *
+     * @since 24.0.0
+     */
+    protected function showIdentificationResult(bool $success): TemplateResponse {
+        return new TemplateResponse('core', 'publicshareauth', ['identityOk' => $success], 'guest');
+    }
+
+    /**
+     * Validates that the provided identity is allowed to receive a temporary password
+     *
+     * @since 24.0.0
+     */
+    protected function validateIdentity(?string $identityToken = null): bool {
+        return false;
+    }
+
+    /**
+     * Generates a password
+     *
+     * @since 24.0.0
+     */
+    protected function generatePassword(): void {
+    }
+
+    /**
+     * Verify the password
+     *
+     * @since 24.0.0
+     */
+    protected function verifyPassword(string $password): bool {
+        return false;
+    }
+
+    /**
+     * Function called after failed authentication
+     *
+     * You can use this to do some logging for example
+     *
+     * @since 14.0.0
+     */
+    protected function authFailed() {
+    }
+
+    /**
+     * Function called after successfull authentication
+     *
+     * You can use this to do some logging for example
+     *
+     * @since 14.0.0
+     */
+    protected function authSucceeded() {
+    }
+
+    /**
+     * @UseSession
+     * @PublicPage
+     * @BruteForceProtection(action=publicLinkAuth)
+     *
+     * Authenticate the share
+     *
+     * @since 14.0.0
+     */
+    final public function authenticate(string $password = '', string $passwordRequest = 'no', string $identityToken = '') {
+        // Already authenticated
+        if ($this->isAuthenticated()) {
+            return $this->getRedirect();
+        }
+
+        // Is user requesting a temporary password?
+        if ($passwordRequest == '') {
+            if ($this->validateIdentity($identityToken)) {
+                $this->generatePassword();
+                $response = $this->showIdentificationResult(true);
+                return $response;
+            } else {
+                $response = $this->showIdentificationResult(false);
+                $response->throttle();
+                return $response;
+            }
+        }
+
+        if (!$this->verifyPassword($password)) {
+            $this->authFailed();
+            $response = $this->showAuthFailed();
+            $response->throttle();
+            return $response;
+        }
+
+        $this->session->regenerateId(true, true);
+        $response = $this->getRedirect();
+
+        $this->session->set('public_link_authenticated_token', $this->getToken());
+        $this->session->set('public_link_authenticated_password_hash', $this->getPasswordHash());
+
+        $this->authSucceeded();
+
+        return $response;
+    }
+
+    /**
+     * Default landing page
+     *
+     * @since 14.0.0
+     */
+    abstract public function showShare(): TemplateResponse;
+
+    /**
+     * @since 14.0.0
+     */
+    final public function getAuthenticationRedirect(string $redirect): RedirectResponse {
+        return new RedirectResponse(
+            $this->urlGenerator->linkToRoute($this->getRoute('showAuthenticate'), ['token' => $this->getToken(), 'redirect' => $redirect])
+        );
+    }
+
+
+    /**
+     * @since 14.0.0
+     */
+    private function getRoute(string $function): string {
+        $app = strtolower($this->appName);
+        $class = (new \ReflectionClass($this))->getShortName();
+        if (substr($class, -10) === 'Controller') {
+            $class = substr($class, 0, -10);
+        }
+        return $app .'.'. $class .'.'. $function;
+    }
+
+    /**
+     * @since 14.0.0
+     */
+    private function getRedirect(): RedirectResponse {
+        //Get all the stored redirect parameters:
+        $params = $this->session->get('public_link_authenticate_redirect');
+
+        $route = $this->getRoute('showShare');
+
+        if ($params === null) {
+            $params = [
+                'token' => $this->getToken(),
+            ];
+        } else {
+            $params = json_decode($params, true);
+            if (isset($params['_route'])) {
+                $route = $params['_route'];
+                unset($params['_route']);
+            }
+
+            // If the token doesn't match the rest of the arguments can't be trusted either
+            if (isset($params['token']) && $params['token'] !== $this->getToken()) {
+                $params = [
+                    'token' => $this->getToken(),
+                ];
+            }
+
+            // We need a token
+            if (!isset($params['token'])) {
+                $params = [
+                    'token' => $this->getToken(),
+                ];
+            }
+        }
+
+        return new RedirectResponse($this->urlGenerator->linkToRoute($route, $params));
+    }
 }

apps/user_ldap/lib/Mapping/UserMapping.php

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
 	 */
 	protected function getTableName(bool $includePrefix = true) {
 		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_user_mapping';
+		return $p.'ldap_user_mapping';
 	}
 }

Indentation +36 added lines, -36 removed lines

@@ -35,44 +35,44 @@
  */
 class UserMapping extends AbstractMapping {
 
-	private IAssertion $assertion;
-	protected const PROV_API_REGEX = '/\/ocs\/v[1-9].php\/cloud\/(groups|users)/';
+    private IAssertion $assertion;
+    protected const PROV_API_REGEX = '/\/ocs\/v[1-9].php\/cloud\/(groups|users)/';
 
-	public function __construct(IDBConnection $dbc, IAssertion $assertion) {
-		$this->assertion = $assertion;
-		parent::__construct($dbc);
-	}
+    public function __construct(IDBConnection $dbc, IAssertion $assertion) {
+        $this->assertion = $assertion;
+        parent::__construct($dbc);
+    }
 
-	/**
-	 * @throws HintException
-	 */
-	public function map($fdn, $name, $uuid): bool {
-		try {
-			$this->assertion->createUserIsLegit();
-		} catch (HintException $e) {
-			static $isProvisioningApi = null;
+    /**
+     * @throws HintException
+     */
+    public function map($fdn, $name, $uuid): bool {
+        try {
+            $this->assertion->createUserIsLegit();
+        } catch (HintException $e) {
+            static $isProvisioningApi = null;
 
-			if ($isProvisioningApi === null) {
-				$request = Server::get(IRequest::class);
-				$isProvisioningApi = \preg_match(self::PROV_API_REGEX, $request->getRequestUri()) === 1;
-			}
-			if ($isProvisioningApi) {
-				// only throw when prov API is being used, since functionality
-				// should not break for end users (e.g. when sharing).
-				// On direct API usage, e.g. on users page, this is desired.
-				throw $e;
-			}
-			return false;
-		}
-		return parent::map($fdn, $name, $uuid);
-	}
+            if ($isProvisioningApi === null) {
+                $request = Server::get(IRequest::class);
+                $isProvisioningApi = \preg_match(self::PROV_API_REGEX, $request->getRequestUri()) === 1;
+            }
+            if ($isProvisioningApi) {
+                // only throw when prov API is being used, since functionality
+                // should not break for end users (e.g. when sharing).
+                // On direct API usage, e.g. on users page, this is desired.
+                throw $e;
+            }
+            return false;
+        }
+        return parent::map($fdn, $name, $uuid);
+    }
 
-	/**
-	 * returns the DB table name which holds the mappings
-	 * @return string
-	 */
-	protected function getTableName(bool $includePrefix = true) {
-		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_user_mapping';
-	}
+    /**
+     * returns the DB table name which holds the mappings
+     * @return string
+     */
+    protected function getTableName(bool $includePrefix = true) {
+        $p = $includePrefix ? '*PREFIX*' : '';
+        return $p . 'ldap_user_mapping';
+    }
 }

apps/user_ldap/lib/Mapping/GroupMapping.php

Indentation +8 added lines, -8 removed lines

@@ -29,12 +29,12 @@
  */
 class GroupMapping extends AbstractMapping {
 
-	/**
-	 * returns the DB table name which holds the mappings
-	 * @return string
-	 */
-	protected function getTableName(bool $includePrefix = true) {
-		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_group_mapping';
-	}
+    /**
+     * returns the DB table name which holds the mappings
+     * @return string
+     */
+    protected function getTableName(bool $includePrefix = true) {
+        $p = $includePrefix ? '*PREFIX*' : '';
+        return $p . 'ldap_group_mapping';
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
 	 */
 	protected function getTableName(bool $includePrefix = true) {
 		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_group_mapping';
+		return $p.'ldap_group_mapping';
 	}
 }

apps/user_ldap/lib/Proxy.php

Spacing +3 added lines, -3 removed lines

@@ -107,7 +107,7 @@ 
 	 * @return string
 	 */
 	protected function getUserCacheKey($uid) {
-		return 'user-' . $uid . '-lastSeenOn';
+		return 'user-'.$uid.'-lastSeenOn';
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 * @return string
 	 */
 	protected function getGroupCacheKey($gid) {
-		return 'group-' . $gid . '-lastSeenOn';
+		return 'group-'.$gid.'-lastSeenOn';
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 		if ($key === null) {
 			return $prefix;
 		}
-		return $prefix . hash('sha256', $key);
+		return $prefix.hash('sha256', $key);
 	}
 
 	/**

Indentation +153 added lines, -153 removed lines

@@ -38,157 +38,157 @@
 use OCP\Server;
 
 abstract class Proxy {
-	/** @var array<string,Access> */
-	private static array $accesses = [];
-	private ILDAPWrapper $ldap;
-	private ?bool $isSingleBackend = null;
-	private ?ICache $cache = null;
-	private AccessFactory $accessFactory;
-
-	public function __construct(
-		ILDAPWrapper $ldap,
-		AccessFactory $accessFactory
-	) {
-		$this->ldap = $ldap;
-		$this->accessFactory = $accessFactory;
-		$memcache = \OC::$server->getMemCacheFactory();
-		if ($memcache->isAvailable()) {
-			$this->cache = $memcache->createDistributed();
-		}
-	}
-
-	private function addAccess(string $configPrefix): void {
-		$userMap = Server::get(UserMapping::class);
-		$groupMap = Server::get(GroupMapping::class);
-
-		$connector = new Connection($this->ldap, $configPrefix);
-		$access = $this->accessFactory->get($connector);
-		$access->setUserMapper($userMap);
-		$access->setGroupMapper($groupMap);
-		self::$accesses[$configPrefix] = $access;
-	}
-
-	protected function getAccess(string $configPrefix): Access {
-		if (!isset(self::$accesses[$configPrefix])) {
-			$this->addAccess($configPrefix);
-		}
-		return self::$accesses[$configPrefix];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getUserCacheKey($uid) {
-		return 'user-' . $uid . '-lastSeenOn';
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupCacheKey($gid) {
-		return 'group-' . $gid . '-lastSeenOn';
-	}
-
-	/**
-	 * @param string $id
-	 * @param string $method
-	 * @param array $parameters
-	 * @param bool $passOnWhen
-	 * @return mixed
-	 */
-	abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
-
-	/**
-	 * @param string $id
-	 * @param string $method
-	 * @param array $parameters
-	 * @return mixed
-	 */
-	abstract protected function walkBackends($id, $method, $parameters);
-
-	/**
-	 * @param string $id
-	 * @return Access
-	 */
-	abstract public function getLDAPAccess($id);
-
-	abstract protected function activeBackends(): int;
-
-	protected function isSingleBackend(): bool {
-		if ($this->isSingleBackend === null) {
-			$this->isSingleBackend = $this->activeBackends() === 1;
-		}
-		return $this->isSingleBackend;
-	}
-
-	/**
-	 * Takes care of the request to the User backend
-	 *
-	 * @param string $id
-	 * @param string $method string, the method of the user backend that shall be called
-	 * @param array $parameters an array of parameters to be passed
-	 * @param bool $passOnWhen
-	 * @return mixed, the result of the specified method
-	 */
-	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
-		if (!$this->isSingleBackend()) {
-			$result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
-		}
-		if (!isset($result) || $result === $passOnWhen) {
-			$result = $this->walkBackends($id, $method, $parameters);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param string|null $key
-	 * @return string
-	 */
-	private function getCacheKey($key) {
-		$prefix = 'LDAP-Proxy-';
-		if ($key === null) {
-			return $prefix;
-		}
-		return $prefix . hash('sha256', $key);
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed|null
-	 */
-	public function getFromCache($key) {
-		if ($this->cache === null) {
-			return null;
-		}
-
-		$key = $this->getCacheKey($key);
-		$value = $this->cache->get($key);
-		if ($value === null) {
-			return null;
-		}
-
-		return json_decode(base64_decode($value));
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function writeToCache($key, $value) {
-		if ($this->cache === null) {
-			return;
-		}
-		$key = $this->getCacheKey($key);
-		$value = base64_encode(json_encode($value));
-		$this->cache->set($key, $value, 2592000);
-	}
-
-	public function clearCache() {
-		if ($this->cache === null) {
-			return;
-		}
-		$this->cache->clear($this->getCacheKey(null));
-	}
+    /** @var array<string,Access> */
+    private static array $accesses = [];
+    private ILDAPWrapper $ldap;
+    private ?bool $isSingleBackend = null;
+    private ?ICache $cache = null;
+    private AccessFactory $accessFactory;
+
+    public function __construct(
+        ILDAPWrapper $ldap,
+        AccessFactory $accessFactory
+    ) {
+        $this->ldap = $ldap;
+        $this->accessFactory = $accessFactory;
+        $memcache = \OC::$server->getMemCacheFactory();
+        if ($memcache->isAvailable()) {
+            $this->cache = $memcache->createDistributed();
+        }
+    }
+
+    private function addAccess(string $configPrefix): void {
+        $userMap = Server::get(UserMapping::class);
+        $groupMap = Server::get(GroupMapping::class);
+
+        $connector = new Connection($this->ldap, $configPrefix);
+        $access = $this->accessFactory->get($connector);
+        $access->setUserMapper($userMap);
+        $access->setGroupMapper($groupMap);
+        self::$accesses[$configPrefix] = $access;
+    }
+
+    protected function getAccess(string $configPrefix): Access {
+        if (!isset(self::$accesses[$configPrefix])) {
+            $this->addAccess($configPrefix);
+        }
+        return self::$accesses[$configPrefix];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getUserCacheKey($uid) {
+        return 'user-' . $uid . '-lastSeenOn';
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupCacheKey($gid) {
+        return 'group-' . $gid . '-lastSeenOn';
+    }
+
+    /**
+     * @param string $id
+     * @param string $method
+     * @param array $parameters
+     * @param bool $passOnWhen
+     * @return mixed
+     */
+    abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+
+    /**
+     * @param string $id
+     * @param string $method
+     * @param array $parameters
+     * @return mixed
+     */
+    abstract protected function walkBackends($id, $method, $parameters);
+
+    /**
+     * @param string $id
+     * @return Access
+     */
+    abstract public function getLDAPAccess($id);
+
+    abstract protected function activeBackends(): int;
+
+    protected function isSingleBackend(): bool {
+        if ($this->isSingleBackend === null) {
+            $this->isSingleBackend = $this->activeBackends() === 1;
+        }
+        return $this->isSingleBackend;
+    }
+
+    /**
+     * Takes care of the request to the User backend
+     *
+     * @param string $id
+     * @param string $method string, the method of the user backend that shall be called
+     * @param array $parameters an array of parameters to be passed
+     * @param bool $passOnWhen
+     * @return mixed, the result of the specified method
+     */
+    protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
+        if (!$this->isSingleBackend()) {
+            $result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+        }
+        if (!isset($result) || $result === $passOnWhen) {
+            $result = $this->walkBackends($id, $method, $parameters);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string|null $key
+     * @return string
+     */
+    private function getCacheKey($key) {
+        $prefix = 'LDAP-Proxy-';
+        if ($key === null) {
+            return $prefix;
+        }
+        return $prefix . hash('sha256', $key);
+    }
+
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
+    public function getFromCache($key) {
+        if ($this->cache === null) {
+            return null;
+        }
+
+        $key = $this->getCacheKey($key);
+        $value = $this->cache->get($key);
+        if ($value === null) {
+            return null;
+        }
+
+        return json_decode(base64_decode($value));
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function writeToCache($key, $value) {
+        if ($this->cache === null) {
+            return;
+        }
+        $key = $this->getCacheKey($key);
+        $value = base64_encode(json_encode($value));
+        $this->cache->set($key, $value, 2592000);
+    }
+
+    public function clearCache() {
+        if ($this->cache === null) {
+            return;
+        }
+        $this->cache->clear($this->getCacheKey(null));
+    }
 }